chore: Cherry-pick modifications from V2 to V3 between 2023-01-19 and…

… 2024-01-24 (#3289) * support all type of blogs for both use cases and tutorials (#3275) Signed-off-by: at670475 <[email protected]> * chore: Sonar scanner runs with Java 17 (#3288) * Separate coverage and sonar tasks. Signed-off-by: Petr Weinfurt <[email protected]> * Use variable for architecture Signed-off-by: Petr Weinfurt <[email protected]> * Use variable for architecture Signed-off-by: Petr Weinfurt <[email protected]> * Refine messages Signed-off-by: Petr Weinfurt <[email protected]> * Increase timeout Signed-off-by: Petr Weinfurt <[email protected]> --------- Signed-off-by: Petr Weinfurt <[email protected]> * fix: Fix disabling EhCache (#3280) --------- Signed-off-by: at670475 <[email protected]> Signed-off-by: Petr Weinfurt <[email protected]> Co-authored-by: Andrea Tabone <[email protected]> Co-authored-by: Petr Weinfurt <[email protected]>
zowe · Jan 25, 2024 · 6762054 · 6762054
1 parent 29d69c9
commit 6762054
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -1491,7 +1491,7 @@ jobs:
     PublishResults:
         needs: [CITests,CITestsWithInfinispan,CITestsZosmfRsu2012,CITestsWithRedisReplica,CITestsWithRedisSentinel,CITestsInternalPort,CloudGatewayProxy,CloudGatewayServiceRouting]
         runs-on: ubuntu-latest
-        timeout-minutes: 15
+        timeout-minutes: 20
 
         steps:
             -   uses: actions/checkout@v4
@@ -1500,6 +1500,8 @@ jobs:
                     ref: ${{ github.head_ref }}
 
             -   uses: ./.github/actions/setup
+                with:
+                    jdkVersion: 17
 
             -   uses: actions/download-artifact@v3
                 with:
@@ -1539,9 +1541,10 @@ jobs:
                     path: cloudgatewayservicerouting
 
             -   name: Code coverage and publish results
-                run: >
-                    ./gradlew --info coverage sonar -Dresults="containercitests/results,citestswithinfinispan/results,containercitestszosmfrsu2012/results,ContainerCITestsWithRedisReplica/results,ContainerCITestsWithRedisSentinel/results,containercitestsinternalport/results,cloudgatewayproxy/results,citestswebsocketchaoticha/results,cloudgatewayservicerouting/results,containercitestszaas/results"
-                    -Psonar.host.url=$SONAR_HOST_URL -Dsonar.token=$SONAR_TOKEN -Partifactory_user=$ARTIFACTORY_USERNAME -Partifactory_password=$ARTIFACTORY_PASSWORD
+                run: |
+                    export JAVA_HOME=$JAVA_HOME_17_${{ runner.arch }}
+                    echo Execute Sonar scanner using Java 17: JAVA_HOME = $JAVA_HOME
+                    ./gradlew --info sonar -Psonar.host.url=$SONAR_HOST_URL -Dsonar.token=$SONAR_TOKEN -Partifactory_user=$ARTIFACTORY_USERNAME -Partifactory_password=$ARTIFACTORY_PASSWORD
                 env:
                     ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
                     ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}

diff --git a/api-catalog-ui/frontend/src/utils/utilFunctions.js b/api-catalog-ui/frontend/src/utils/utilFunctions.js
@@ -51,7 +51,7 @@ export default function countAdditionalContents(service) {
         (product) => service?.serviceId === product.name
     ) || { useCases: [], tutorials: [], videos: [], documentation: null };
 
-    const filteredUseCases = useCases?.filter(({ url, user }) => isValidUrl(url) && user);
+    const filteredUseCases = useCases?.filter(({ url }) => isValidUrl(url));
     const filteredTutorials = tutorials?.filter(({ url }) => isValidUrl(url));
     const useCasesCounter = countValidItems(filteredUseCases, (item) => isValidUrl(item.url));
     const tutorialsCounter = countValidItems(filteredTutorials, (item) => isValidUrl(item.url));

diff --git a/gateway-service/src/main/java/org/zowe/apiml/gateway/config/DiscoveryClientConfig.java b/gateway-service/src/main/java/org/zowe/apiml/gateway/config/DiscoveryClientConfig.java
@@ -60,7 +60,7 @@
 @Configuration
 @RequiredArgsConstructor
 // There is an issue - clashing of XML configuration
-@DependsOn({"cacheConfig", "cacheManagerFactoryBean"})
+@DependsOn({"cacheConfig", "cacheManager"})
 public class DiscoveryClientConfig {
     private final AbstractDiscoveryClientOptionalArgs<?> optionalArgs;
     private final ApimlDiscoveryClientFactory apimlDiscoveryClientFactory;