Merge pull request #117 from evrentan/feat/upgrade-java-21

feat(general): upgrade java 21

api-gateway/Dockerfile

@@ -1,10 +1,10 @@
 ARG APP_JAR=api-gateway-1.0.0.jar
-FROM gradle:7-jdk17-alpine AS build
+FROM gradle:8.5-jdk21 AS build
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle build -x test
 
-FROM openjdk:17-alpine
+FROM openjdk:21
 LABEL maintainer="Evren Tan"
 ARG APP_JAR
 ENV APP_JAR_ENV=$APP_JAR

api-gateway/build.gradle

@@ -1,12 +1,12 @@
 plugins {
-    id 'org.springframework.boot' version '3.0.6'
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+    id 'org.springframework.boot' version '3.2.1'
+    id 'io.spring.dependency-management' version '1.1.4'
     id 'java'
 }
 
 group = 'evrentan.community'
 version = '1.0.0'
-sourceCompatibility = '17'
+sourceCompatibility = '21'
 
 springBoot {
     buildInfo()
@@ -20,7 +20,7 @@ repositories {
 }
 
 ext {
-    set('springCloudVersion', "2022.0.0")
+    set('springCloudVersion', "2023.0.0")
 }
 
 dependencies {

api-gateway/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

api-gateway/gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

api-gateway/gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

community-manager/Dockerfile

@@ -1,10 +1,10 @@
 ARG APP_JAR=community-manager-1.0.0.jar
-FROM gradle:7-jdk17-alpine AS build
+FROM gradle:8.5-jdk21 AS build
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle build -x test
 
-FROM openjdk:17-alpine
+FROM openjdk:21
 LABEL maintainer="Evren Tan"
 ARG APP_JAR
 ENV APP_JAR_ENV=$APP_JAR

community-manager/build.gradle

@@ -1,12 +1,12 @@
 plugins {
-    id 'org.springframework.boot' version '3.0.6'
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+    id 'org.springframework.boot' version '3.2.1'
+    id 'io.spring.dependency-management' version '1.1.4'
     id 'java'
 }
 
 group = 'evrentan.community'
 version = '1.0.0'
-sourceCompatibility = '17'
+sourceCompatibility = '21'
 
 springBoot {
     buildInfo()
@@ -26,7 +26,7 @@ repositories {
 }
 
 ext {
-    set('springCloudVersion', "2022.0.0")
+    set('springCloudVersion', "2023.0.0")
 }
 
 dependencies {

community-manager/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

community-manager/gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         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.

community-manager/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+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!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+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

community-manager/src/main/resources/bootstrap.properties

@@ -5,17 +5,6 @@ spring.profiles.active = local
 spring.application.name = community-manager
 server.port = ${SERVER_PORT:8081}
 
-# Config server setting
-spring.cloud.config.uri = ${CONFIG_SERVER_URI:http://localhost:8888}
-spring.cloud.config.username = ${CONFIG_SERVER_USERNAME:config-server}
-spring.cloud.config.password = ${CONFIG_SERVER_PASSWORD:Config*Server.321}
-spring.cloud.config.fail-fast = true
-spring.cloud.config.retry.initial-interval = 3000
-spring.cloud.config.retry.multiplier = 1.3
-spring.cloud.config.retry.max-attempts = 20
-spring.cloud.config.retry.max-interval = 5000
-#spring.cloud.config.profile = local
-
 #Discovery server
 eureka.client.service-url.defaultZone = ${SERVICE_DISCOVERY_DEFAULT_ZONE:http://localhost:6969/eureka}
 eureka.instance.lease-renewal-interval-in-seconds = 10

config-server-data/event-manager/event-manager-dev.properties

@@ -3,7 +3,7 @@
 # local, dev
 spring.profiles.active = local
 spring.application.name = event-manager
-server.port = ${SERVER_PORT:8081}
+server.port = ${SERVER_PORT:8201}
 
 # Config server setting
 spring.cloud.config.uri = ${CONFIG_SERVER_URI:http://localhost:8888}

config-server-data/event-manager/event-manager-local.properties

@@ -3,7 +3,7 @@
 # local, dev
 spring.profiles.active = local
 spring.application.name = event-manager
-server.port = ${SERVER_PORT:8081}
+server.port = ${SERVER_PORT:8201}
 
 # Config server setting
 spring.cloud.config.uri = ${CONFIG_SERVER_URI:http://localhost:8888}

config-server-data/user-manager/user-manager-dev.properties

@@ -51,7 +51,7 @@ spring.flyway.schemas = ${SPRING_FLYWAY_SCHEMAS:user-manager}
 spring.flyway.baseline-on-migrate = true
 
 # Actuator Settings
-management.server.port = 8201
+management.server.port = 8091
 management.endpoints.web.exposure.include = info, health, health-path, caches, caches-cache, refresh
 management.endpoint.health.show-components = always
 management.endpoint.health.show-details = always

config-server-data/user-manager/user-manager-local.properties

@@ -51,7 +51,7 @@ spring.flyway.schemas = ${SPRING_FLYWAY_SCHEMAS:user-manager}
 spring.flyway.baseline-on-migrate = true
 
 # Actuator Settings
-management.server.port = 8201
+management.server.port = 8091
 management.endpoints.web.exposure.include = info, health, health-path, caches, caches-cache, refresh
 management.endpoint.health.show-components = always
 management.endpoint.health.show-details = always

config-server/Dockerfile

@@ -1,5 +1,5 @@
 ARG APP_JAR=config-server-1.0.0.jar
-FROM gradle:7-jdk17-alpine AS build
+FROM gradle:8.5-jdk21 AS build
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle build -x test
@@ -9,7 +9,7 @@ RUN mkdir /app
 COPY ../config-server-data /app
 RUN cd /app; chmod 400 config-server-data
 
-FROM openjdk:17-alpine
+FROM openjdk:21
 LABEL maintainer="Evren Tan"
 ARG APP_JAR
 ENV APP_JAR_ENV=$APP_JAR