merge the master

vmware · Jul 26, 2023 · 1182c84 · 1182c84
2 parents 7e276ab + defddd0
commit 1182c84
Show file tree

Hide file tree

Showing 142 changed files with 1,673 additions and 1,423 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -48,11 +48,11 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '8'
+          java-version: '17'
       - name: Unit test
         run: |
           cd $GITHUB_WORKSPACE/g11n-ws
@@ -84,11 +84,11 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '8'
+          java-version: '17'
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1
       - name: Autobuild
@@ -127,11 +127,11 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '8'
+          java-version: '17'
       - name: Smoke Test
         run: |
           git clone --branch=devops https://github.com/vmware/singleton.git devops
@@ -159,11 +159,11 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '8'
+          java-version: '17'
       - name: Set up Python3
         uses: actions/setup-python@v4
         with:

diff --git a/g11n-ws/build.gradle b/g11n-ws/build.gradle
@@ -3,7 +3,7 @@
 
 buildscript {
     ext {
-     springBootVersion = '2.7.12'
+     springBootVersion = '3.1.1'
     }
     repositories {
         mavenLocal()
@@ -31,7 +31,9 @@ allprojects{
 
 
     group = 'com.vmware'
-
+    sourceCompatibility = '17'
+
+
     repositories {
         mavenLocal() 
         maven { url "https://repo1.maven.org/maven2/" }
@@ -48,18 +50,15 @@ allprojects{
 subprojects{
 
 
-    sourceCompatibility = '1.8'
-
+
     ext {
 
         projectVersion = '0.0.1-SNAPSHOT'
-        springWebVersion='5.3.27'
-        tomcatVersion= '9.0.75'
         httpclient='4.5.13'
         jacksonVersion = '2.15.2'
-    	sqliteVersion= '3.41.2.1'
+        springdocVersion='2.1.0'
 
-    	ehCacheVersion = '3.9.2'
+    	ehCacheVersion = '3.10.8'
     	cacheApiVersion='1.1.1'
     	hsqlVersion = '2.3.3'
     	junitVersion = '4.13.2'
@@ -72,14 +71,14 @@ subprojects{
     	guavaVersion="30.1.1-jre"
     	snakeyam="2.0"
     	jjwtVersion="0.9.1"
-    	hibernateJpa21Api = "1.0.2"
+    	hibernateJpa21Api = "1.0.2.Final"
     	log4j2Version="2.18.0"
     	slf4jVersion="1.7.32"
     	esapiVersion="2.5.1.0"
 
     	postgresqlVersion = "42.1.4"
     	druidVersion = "1.1.8"
-    	awsS3Version = "1.12.261"
+    	awsS3Version = "1.12.497"
         swaggerVersion = "3.0.0"
         icu4jVersion = "60.3"
 

diff --git a/g11n-ws/gradle/wrapper/gradle-wrapper.jar b/g11n-ws/gradle/wrapper/gradle-wrapper.jar
diff --git a/g11n-ws/gradle/wrapper/gradle-wrapper.properties b/g11n-ws/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/g11n-ws/gradlew b/g11n-ws/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

diff --git a/g11n-ws/gradlew.bat b/g11n-ws/gradlew.bat
@@ -1,92 +1,92 @@
-@rem
-@rem Copyright 2019-2022 VMware, Inc.
-@rem SPDX-License-Identifier: EPL-2.0
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-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 %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem Copyright 2019-2023 VMware, Inc.
+@rem SPDX-License-Identifier: EPL-2.0
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+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 %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/g11n-ws/modules/md-data-api-bundleimpl/build.gradle b/g11n-ws/modules/md-data-api-bundleimpl/build.gradle
@@ -1,4 +1,4 @@
-//Copyright 2019-2022 VMware, Inc.
+//Copyright 2019-2023 VMware, Inc.
 //SPDX-License-Identifier: EPL-2.0
 apply plugin: 'java-library'
 apply plugin: 'org.springframework.boot'
@@ -16,8 +16,14 @@ jar {
 dependencies {
     api project(":md-data-api")
 	api project(":vip-common")
-	implementation("org.springframework.boot:spring-boot")
-	implementation("org.slf4j:slf4j-api:$slf4jVersion")
+    compileOnly("org.springframework.boot:spring-boot")
+    compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
+    compileOnly("commons-io:commons-io:$commonsIoVersion")
+    compileOnly("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
+    compileOnly("org.apache.commons:commons-lang3:$commonsLangVersion")
+
+
+
 }
 
 bootJar {

diff --git a/g11n-ws/modules/md-data-api-mt/build.gradle b/g11n-ws/modules/md-data-api-mt/build.gradle
@@ -23,6 +23,12 @@ dependencies {
     compileOnly("org.springframework.boot:spring-boot-starter-data-jpa")
     compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
     compileOnly("commons-collections:commons-collections:$commonsCollectionsVersion")
+    compileOnly("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
+    compileOnly("org.apache.commons:commons-lang3:$commonsLangVersion")
+    compileOnly("com.googlecode.json-simple:json-simple:$jsonSimpleVersion"){
+        exclude group: 'junit'
+    }
+
 }
 
 bootJar {

diff --git a/g11n-ws/modules/md-data-api-mt/src/main/java/com/vmware/vip/messages/mt/MTConfigContent.java b/g11n-ws/modules/md-data-api-mt/src/main/java/com/vmware/vip/messages/mt/MTConfigContent.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019-2022 VMware, Inc.
+ * Copyright 2019-2023 VMware, Inc.
  * SPDX-License-Identifier: EPL-2.0
  */
 package com.vmware.vip.messages.mt;
 
-import javax.annotation.PostConstruct;
 
+import jakarta.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 

diff --git a/...md-data-api-mt/src/main/java/com/vmware/vip/messages/mt/intento/IntentoConfigContent.java b/...md-data-api-mt/src/main/java/com/vmware/vip/messages/mt/intento/IntentoConfigContent.java
@@ -1,14 +1,14 @@
 /*
- * Copyright 2019-2022 VMware, Inc.
+ * Copyright 2019-2023 VMware, Inc.
  * SPDX-License-Identifier: EPL-2.0
  */
 
 package com.vmware.vip.messages.mt.intento;
 
+import jakarta.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
-import javax.annotation.PostConstruct;
 
 /**
  * A config class to accept the configuration settings from application properties