chore: env update in release (#4359)

Signed-off-by: ac892247 <[email protected]>
Co-authored-by: Zowe Robot <[email protected]>

Author: achmelo

.github/workflows/automated-release.yml

@@ -52,19 +52,23 @@ jobs:
               shell: bash
               run: |
                   ./gradlew release $RELEASE_ARGS -Prelease.useAutomaticVersion=true -Prelease.scope=${{ github.event.inputs.scope || env.DEFAULT_SCOPE }} -Pzowe.deploy.username=$ARTIFACTORY_USERNAME -Pzowe.deploy.password=$ARTIFACTORY_PASSWORD -Partifactory_user=$ARTIFACTORY_USERNAME -Partifactory_password=$ARTIFACTORY_PASSWORD
-                  released_version=$(cat gradle.properties | grep "version=" | sed "s/version=//g")
-                  sed -i "/REACT_APP_ZOWE_BUILD_INFO=/c\REACT_APP_ZOWE_BUILD_INFO=${released_version}" api-catalog-ui/frontend/.env
-                  git add api-catalog-ui/frontend/.env
-                  git commit -m "[skip ci] Update version"
-                  git push
+                  if [ -n "$RELEASE_ARGS" ]; then
+                     echo "RELEASE_ARGS is empty. Skipping api catalog .env update."
+                  else
+                      released_version=$(cat gradle.properties | grep "version=" | sed "s/version=//g")
+                      sed -i "/REACT_APP_ZOWE_BUILD_INFO=/c\REACT_APP_ZOWE_BUILD_INFO=${released_version}" api-catalog-ui/frontend/.env
+                      git add api-catalog-ui/frontend/.env
+                      git commit -m "[skip ci] Update version"
+                      git push
+                  fi
+
               env:
                   ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
                   ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
                   DEFAULT_SCOPE: 'patch'
                   BUILD_NUMBER: ${{ github.run_number }}
                   BRANCH_NAME: ${{ github.ref_name }}
                   RELEASE_ARGS: ${{ github.event.inputs.enablers == 'true' && '-PreleaseEnablers' || '' }}
-
             -  name: Store test results
                uses: actions/upload-artifact@v4
                if: failure()

api-catalog-ui/frontend/.env

@@ -8,5 +8,5 @@ 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.3.16-SNAPSHOT
+REACT_APP_ZOWE_BUILD_INFO=3.3.21-SNAPSHOT
 

apiml-package/src/main/resources/bin/start.sh

@@ -106,6 +106,14 @@
 # - ZWE_configs_storage_vsam_name
 # Optional variables:
 
+add_profile() {
+    new_profile=$1
+    if [ -n "${ZWE_configs_spring_profiles_active}" ]; then
+        ZWE_configs_spring_profiles_active="${ZWE_configs_spring_profiles_active},"
+    fi
+    ZWE_configs_spring_profiles_active="${ZWE_configs_spring_profiles_active}${new_profile}"
+}
+
 if [ -n "${LAUNCH_COMPONENT}" ]; then
     JAR_FILE="${LAUNCH_COMPONENT}/apiml-lite.jar"
 else
@@ -180,14 +188,6 @@ if [ -n "${ZWE_configs_logging_config}" ]; then
     LOGBACK="-Dlogging.config=${ZWE_configs_logging_config}"
 fi
 
-add_profile() {
-    new_profile=$1
-    if [ -n "${ZWE_configs_spring_profiles_active}" ]; then
-        ZWE_configs_spring_profiles_active="${ZWE_configs_spring_profiles_active},"
-    fi
-    ZWE_configs_spring_profiles_active="${ZWE_configs_spring_profiles_active}${new_profile}"
-}
-
 ATTLS_SERVER_ENABLED="false"
 ATTLS_CLIENT_ENABLED="false"
 

enabler.properties

@@ -1,2 +1,2 @@
 
-version=3.3.18-SNAPSHOT
+version=3.3.19-SNAPSHOT

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.3.16
+version=3.3.21-SNAPSHOT
 
 nodejsVersion=14.16.0
 cleanNodeModules=false

gradle/publish.gradle

@@ -36,8 +36,6 @@ ext.servicesToPublish = [
 
 ext.zoweComponentsToPublish = ext.servicesToPublish + ext.javaLibraries
 
-ext.sdksToPublish = ext.enablers + ext.javaLibraries
-
 configure(subprojects.findAll { it.name in zoweComponentsToPublish }) {
     apply plugin: 'maven-publish'
     apply plugin: 'java'
@@ -84,7 +82,7 @@ if (enablerPropsFile.exists()) {
 //3. Get the version, or use the rootProject.version as a fallback
 def sdkVersion = enablerProps.getProperty("version")
 
-configure(subprojects.findAll { it.name in sdksToPublish }) {
+configure(subprojects.findAll { it.name in enablers }) {
     apply plugin: 'maven-publish'
     apply plugin: 'java'
 
@@ -116,7 +114,7 @@ configure(subprojects.findAll { it.name in sdksToPublish }) {
     }
 }
 
-configure(subprojects.findAll { it.name in sdksToPublish }) {
+configure(subprojects.findAll { it.name in enablers }) {
     publishing {
         publications {
             mavenJava(MavenPublication) {
@@ -150,6 +148,41 @@ configure(subprojects.findAll { it.name in sdksToPublish }) {
         }
     }
 
+}
+configure(subprojects.findAll { it.name in javaLibraries }) {
+    publishing {
+        publications {
+            mavenJava(MavenPublication) {
+                groupId 'org.zowe.apiml.sdk'
+                version rootProject.version
+                artifactId "${project.name}"
+
+                from components.java
+
+                pom.withXml {
+                    asNode().dependencies.'*'.findAll() {
+                        it.scope.text() == 'runtime' && project.configurations.implementation.allDependencies.find { dep ->
+                            dep.name == it.artifactId.text()
+                        }
+                    }.each { it.scope*.value = 'compile' }
+                }
+            }
+        }
+    }
+
+    tasks.withType(Jar) {
+        manifest {
+            attributes "Specification-Title": project.name
+            attributes "Specification-Version": rootProject.version
+            attributes "Specification-Vendor": "Zowe org"
+
+            attributes "Implementation-Title": project.name
+            attributes "Implementation-Version": rootProject.version
+            attributes "Implementation-Vendor": "Zowe org"
+            attributes "Implementation-Vendor-Id": "org.zowe.apiml.sdk"
+        }
+    }
+
 }
 
 configure(subprojects.findAll { it.name in servicesToPublish }) {
@@ -186,7 +219,7 @@ ext.publishZoweServerTasksList = zoweComponentsToPublish.collect {
 
 ext.publishTasksList = enablers.collect {
     ":" + it + ":publish"
-} + ":platform:publish"
+}
 
 //noinspection GroovyAssignabilityCheck
 tasks.register('publishZoweServerArtifacts') {

integration-tests/build.gradle

@@ -291,7 +291,8 @@ task runAllIntegrationTestsForZoweModulithNonHaTestingOnZos(type: Test) {
             'GatewayProxyTest',
             'GatewayCentralRegistry',
             'SafIdTokenTest',
-            'ZaasTest' // These tests require ZAAS as a separate service with its own port and specific paths that are not part of the public API
+            'ZaasTest', // These tests require ZAAS as a separate service with its own port and specific paths that are not part of the public API
+            'NonModulithTest'
         )
     }