Merge "Update third party dependencies"

Author: turlaub

api/build.gradle

@@ -3,7 +3,7 @@ plugins {
   id 'java-library'
   id 'maven-publish'
   id 'signing'
-  id 'com.github.johnrengelman.shadow' version '5.2.0'
+  id 'com.github.johnrengelman.shadow' version '6.0.0'
   id "io.swagger.core.v3.swagger-gradle-plugin" version "2.1.2"
 }
 

build.gradle

@@ -27,7 +27,7 @@ plugins {
     id 'base'
     id 'jacoco'
     id 'com.github.ben-manes.versions' version '0.28.0'
-    id "org.sonarqube" version "2.8"
+    id "org.sonarqube" version "3.0"
 }
 
 apply plugin: 'org.cyclonedx.bom'

common/build.gradle

@@ -12,7 +12,7 @@ dependencies {
         'org.apache.logging.log4j:log4j-slf4j-impl:2.13.3',
         'javax.annotation:javax.annotation-api:1.3.2',
 
-        'com.github.spotbugs:spotbugs-annotations:4.0.3',
+        'com.github.spotbugs:spotbugs-annotations:4.0.6',
     )
 
     implementation (

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew

@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

gradlew.bat

@@ -6,7 +6,7 @@ dependencies {
         'javax.xml.bind:jaxb-api:2.3.1',
         'org.glassfish.jaxb:jaxb-runtime:2.3.3',
         'javax.activation:activation:1.1.1',
-        'jakarta.servlet:jakarta.servlet-api:4.0.3',
+        'jakarta.servlet:jakarta.servlet-api:4.0.4',
         'org.slf4j:jul-to-slf4j:1.7.30',
         'org.glassfish.grizzly:grizzly-http-servlet:2.4.4',
         project(":common"),

jersey/build.gradle

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'cz.habarta.typescript-generator:typescript-generator-gradle-plugin:2.23.603'
+        classpath 'cz.habarta.typescript-generator:typescript-generator-gradle-plugin:2.24.612'
     }
 }
 

ui/build.gradle

@@ -214,6 +214,9 @@ describe("Central/Managed Basic Test", function() {
     cy.contains('mat-icon', 'dns').click();
     cy.waitUntilContentLoaded();
 
+    // fresh load to make sure the current state is OK
+    cy.gotoInstance(groupName, managedInstance, 'CENTRAL');
+
     cy.getLatestInstanceVersion().installAndActivate();
 
     cy.gotoInstance(groupName, managedInstance, 'MANAGED');
@@ -262,6 +265,9 @@ describe("Central/Managed Basic Test", function() {
     cy.contains('mat-icon', 'dns').click();
     cy.waitUntilContentLoaded();
 
+    // fresh load to make sure the current state is OK
+    cy.gotoInstance(groupName, managedInstance, 'CENTRAL');
+
     cy.startProcess('master', 'Server Application');
 
     // click process output button
@@ -311,6 +317,9 @@ describe("Central/Managed Basic Test", function() {
     cy.contains('mat-icon', 'dns').click();
     cy.waitUntilContentLoaded();
 
+    // fresh load to make sure the current state is OK
+    cy.gotoInstance(groupName, managedInstance, 'CENTRAL');
+
     cy.getApplicationConfigCard('master', 'Server Application').click();
     cy.getApplicationConfigCard('master', 'Server Application').within(() => {
       cy.get('app-process-status').find('.app-process-running').should('not.exist')

ui/webapp/browserslist renamed to ui/webapp/.browserslistrc

@@ -13,6 +13,12 @@ Cypress.Commands.add('waitUntilContentLoaded', function() {
 
   cy.get('ngx-loading-bar').children().should('not.exist'); // page not yet loaded fully (e.g. lazy loading large module)
 
+  cy.get('body').then($body => {
+    if($body.find('span:contains("Loading Module...")').length > 0) {
+      cy.get('span:contains("Loading Module...")').should('not.exist');
+    }
+  });
+
   cy.get('body').then($body => {
     if($body.find('mat-progress-spinner').length > 0) {
       cy.get('mat-progress-spinner').should('not.be.visible');