Updated github workflow

Update codacy/codacy-analysis-cli-action digest to 9acc82f

.dockerignore

@@ -0,0 +1,7 @@
+.idea/
+.gradle/
+k8s/
+build/
+.github/
+uploads/
+apps/

.github/workflows/ci.yml

@@ -41,7 +41,7 @@ jobs:
             - name: Push to dokku
               uses: dokku/github-action@master
               with:
-                  git_remote_url: 'ssh://dokku@heroku.ctdn.net:2222/spring-web-modules'
+                  git_remote_url: 'ssh://dokku@heroku.ctdn.net:2222/spring-web-api-demo'
                   ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
                   branch: main
                   git_push_flags: --force

.github/workflows/codacy.yml

@@ -35,11 +35,11 @@ jobs:
     steps:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@d840f886c4bd4edc059706d09c6a1586111c540b
+        uses: codacy/codacy-analysis-cli-action@9acc82f5c4d097d191a50b89b4a447207d280b14
         with:
           # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
           # You can also omit the token and run the tools that support default configurations
@@ -55,6 +55,6 @@ jobs:
 
       # Upload the SARIF file generated in the previous step
       - name: Upload SARIF results file
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: results.sarif

.gitignore

@@ -36,4 +36,6 @@ out/
 ### VS Code ###
 .vscode/
 
-.DS_Store
+.DS_Store
+
+uploads/

Dockerfile

@@ -1,24 +1,25 @@
 # Builder
-FROM cubetiq/openjdk:11u-ubuntu as builder
+FROM bellsoft/liberica-openjdk-alpine-musl as builder
 LABEL maintainer="sombochea@cubetiqs.com"
 
 WORKDIR /app
 
-RUN apt-get update && apt-get install -y git
+COPY gradlew ./
+COPY gradle ./gradle
+RUN ./gradlew
 
-COPY . .
 
-RUN sh gradlew clean bootJar
-RUN rm -f build/libs/*-plain.jar
+COPY settings.gradle.kts ./
+COPY build.gradle.kts ./
+COPY api/build.gradle.kts ./api/build.gradle.kts
+COPY api/src ./api/src
+
+RUN ./gradlew api:bootJar
 
 # Build for container image
-FROM cubetiq/openjdk:jre-11u-debian
+FROM bellsoft/liberica-openjre-alpine-musl
 LABEL maintainer="sombochea@cubetiqs.com"
 
-# Setup timezone to Phnom Penh
-RUN ln -sf /usr/share/zoneinfo/Asia/Phnom_Penh /etc/localtime
-RUN echo "Asia/Phnom_Penh" > /etc/timezone
-
 # App root path
 WORKDIR /opt/cubetiq
 
@@ -29,7 +30,7 @@ VOLUME ["/opt/cubetiq", "/data"]
 ARG API_BUILD_DIR=api/build
 
 # Copy the app bundle to the workdir
-COPY --from=builder /app/${API_BUILD_DIR}/libs/api-0.0.1-SNAPSHOT.jar ./api.jar
+COPY --from=builder /app/${API_BUILD_DIR}/libs/api.jar ./api.jar
 
 # App profile will run with
 ENV PROFILE=dev

README.md

@@ -9,9 +9,9 @@
 
 ### Language and Framework
 
-- Spring Boot: 2.7.4
-- Kotlin: 1.7.20
-- Gradle: 7.5
+- Spring Boot: 3.0.0
+- Kotlin: 1.7.22
+- Gradle: 7.5.1
 
 # Modules
 

api/build.gradle.kts

@@ -1,61 +1,46 @@
 import java.io.ByteArrayOutputStream
 
 plugins {
-	id("org.springframework.boot")
-	id("io.spring.dependency-management")
-	kotlin("jvm")
-	kotlin("plugin.spring")
-	kotlin("plugin.jpa")
-}
-
-val kotlinVersion = "1.7.20"
-val springBootVersion = "2.7.4"
-
-// find the last commit
-fun getGitHashLastCommit(): String {
-	val stdout = ByteArrayOutputStream()
-	exec {
-		commandLine("git", "rev-parse", "HEAD")
-		standardOutput = stdout
-	}
-
-	return stdout.toString().trim()
+    id("org.springframework.boot")
+    id("io.spring.dependency-management")
+    kotlin("jvm")
+    kotlin("plugin.spring")
+    kotlin("plugin.jpa")
 }
 
 springBoot {
-	buildInfo {
-		properties {
-			additional["commitId"] = getGitHashLastCommit()
-			additional["springBootVersion"] = springBootVersion
-			additional["kotlinVersion"] = kotlinVersion
-		}
-	}
+    buildInfo { }
 }
 
 dependencies {
-	// Spring Data JPA (Required for Database Layer)
-	implementation("org.springframework.boot:spring-boot-starter-data-jpa")
-	implementation("org.springframework.boot:spring-boot-starter-data-redis")
+    // Spring Data JPA (Required for Database Layer)
+    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+    implementation("org.springframework.boot:spring-boot-starter-data-redis")
+    implementation("org.springframework.boot:spring-boot-starter-validation")
 
-	// Migrating from SpringFox
-	implementation("org.springdoc:springdoc-openapi-ui:1.6.11")
+    // Migrating from SpringDoc API (Swagger) for Support Spring Boot 3.x
+    implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2")
 
-	// SPRING FRAMEWORK AND CORE
-	implementation("org.springframework.boot:spring-boot-starter-web")
-	implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
+    // SPRING FRAMEWORK AND CORE
+    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
 
-	// Development Runtime
-	developmentOnly("org.springframework.boot:spring-boot-devtools")
+    // Development Runtime
+    developmentOnly("org.springframework.boot:spring-boot-devtools")
 
-	implementation("org.jetbrains.kotlin:kotlin-reflect")
-	implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    implementation("org.jetbrains.kotlin:kotlin-reflect")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 
-	runtimeOnly("com.h2database:h2")
-	// runtimeOnly("org.postgresql:postgresql")
+    runtimeOnly("com.h2database:h2")
+    // runtimeOnly("org.postgresql:postgresql")
 
-	testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
 }
 
 tasks.withType<Test> {
-	useJUnitPlatform()
+    useJUnitPlatform()
 }
+
+tasks.withType<org.springframework.boot.gradle.tasks.bundling.BootJar> {
+    archiveFileName.set("api.jar")
+}

api/src/main/kotlin/com/cubetiqs/web/config/OpenApiDocConfig.kt

@@ -6,12 +6,12 @@ import io.swagger.v3.oas.annotations.security.SecurityScheme
 import io.swagger.v3.oas.models.OpenAPI
 import io.swagger.v3.oas.models.info.Info
 import io.swagger.v3.oas.models.info.License
-import org.springdoc.core.GroupedOpenApi
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import io.swagger.v3.oas.annotations.OpenAPIDefinition
 import io.swagger.v3.oas.annotations.servers.Server
+import org.springdoc.core.models.GroupedOpenApi
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 
 //import org.springdoc.core.SpringDocUtils

api/src/main/kotlin/com/cubetiqs/web/controller/ApiDoc.kt

@@ -10,6 +10,6 @@ import org.springframework.web.servlet.view.RedirectView
 class ApiDoc {
     @GetMapping(value = [ "/api-doc", "/api-docs"])
     fun redirect(): RedirectView {
-        return RedirectView("/swagger-ui/")
+        return RedirectView("/swagger-ui/index.html")
     }
 }

api/src/main/kotlin/com/cubetiqs/web/controller/IndexController.kt

@@ -33,7 +33,6 @@ class IndexController @Autowired constructor(
             service = buildProperties.artifact,
             version = buildProperties.version,
             date = buildProperties.time.toString(),
-            commit = buildProperties["commitId"],
             authors = authors,
         )
         return response(response)

api/src/main/kotlin/com/cubetiqs/web/model/response/ApiInfoResponse.kt

@@ -9,7 +9,6 @@ data class ApiInfoResponse(
     val service: String,
     val version: String,
     val date: String,
-    val commit: String,
     val authors: Collection<ApiInfoAuthorResponse> = listOf(),
 ) : BaseRequestModel
 

api/src/main/kotlin/com/cubetiqs/web/modules/uploader/UploaderController.kt

@@ -14,7 +14,7 @@ import org.springframework.util.FileCopyUtils
 import org.springframework.web.bind.annotation.*
 import org.springframework.web.multipart.MultipartFile
 import java.util.*
-import javax.servlet.http.HttpServletResponse
+import jakarta.servlet.http.HttpServletResponse
 
 @UploaderModule
 @Tag(name = "Uploader Controller")

api/src/main/kotlin/com/cubetiqs/web/modules/uploader/UploaderEntity.kt

@@ -12,40 +12,47 @@ import java.io.InputStream
 import java.io.Serializable
 import java.nio.file.Files
 import java.util.*
-import javax.persistence.*
+import jakarta.persistence.*
+import org.hibernate.annotations.GenericGenerator
 
 @UploaderModule
 @Entity
-@Table(name = "uploader")
+@Table(name = "`uploader`")
 @EntityListeners(AuditingEntityListener::class)
 open class UploaderEntity(
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
+    @GeneratedValue(generator = "custom-uuid")
+    @GenericGenerator(
+        name = "custom-uuid",
+        strategy = "org.hibernate.id.UUIDGenerator",
+        parameters = [org.hibernate.annotations.Parameter(name = "uuid_gen_strategy_class", value = "org.hibernate.id.uuid.CustomVersionOneStrategy")]
+    )
+    @Column(columnDefinition = "BINARY(16)")
     open var id: UUID? = null,
 
-    @Column(name = "filename")
+    @Column(name = "`filename`")
     open var filename: String? = null,
 
-    @Column(name = "content_type")
+    @Column(name = "`content_type`")
     open var contentType: String? = null,
 
-    @Column(name = "content_length")
+    @Column(name = "`content_length`")
     open var contentLength: Long? = null,
 
-    @Column(name = "path", length = 300)
+    @Column(name = "`path`", length = 300)
     open var path: String? = null,
 
     @Temporal(TemporalType.TIMESTAMP)
-    @Column(name = "created_at")
+    @Column(name = "`created_at`")
     @CreatedDate
     open var createdAt: Date? = null,
 
     @Temporal(TemporalType.TIMESTAMP)
-    @Column(name = "updated_at")
+    @Column(name = "`updated_at`")
     @LastModifiedDate
     open var updatedAt: Date? = null,
 
-    @Column(length = 30)
+    @Column(length = 30, name = "`provider_type`")
     open var providerType: String? = null,
 ) : Serializable {
     @Transient

api/src/main/kotlin/com/cubetiqs/web/modules/user/UserEntity.kt

@@ -3,20 +3,27 @@ package com.cubetiqs.web.modules.user
 import org.hibernate.Hibernate
 import java.io.Serializable
 import java.util.*
-import javax.persistence.*
+import jakarta.persistence.*
+import org.hibernate.annotations.GenericGenerator
 
 @UserModule
 @Entity
-@Table(name = "user")
+@Table(name = "`user`")
 open class UserEntity(
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
+    @GeneratedValue(generator = "custom-uuid")
+    @GenericGenerator(
+        name = "custom-uuid",
+        strategy = "org.hibernate.id.UUIDGenerator",
+        parameters = [org.hibernate.annotations.Parameter(name = "uuid_gen_strategy_class", value = "org.hibernate.id.uuid.CustomVersionOneStrategy")]
+    )
+    @Column(columnDefinition = "BINARY(16)")
     open var id: UUID? = null,
 
-    @Column(name = "name", length = 50)
+    @Column(name = "`name`", length = 50)
     open var name: String? = null,
 
-    @Column(name = "username", length = 50, unique = true)
+    @Column(name = "`username`", length = 50, unique = true)
     open var username: String? = null,
 ) : Serializable {
     override fun equals(other: Any?): Boolean {

api/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 http:
-  port: ${HTTP_PORT:8080}
+  port: ${PORT:8080}
 server:
   port: ${SERVER_PORT:8443}
   ssl:
@@ -15,10 +15,6 @@ spring:
     active: ${APP_PROFILE:demo}
   application:
     name: ${SERVICE_NAME:cubetiq-api-service}
-  redis:
-    enabled: ${REDIS_ENABLED:false}
-    host: ${REDIS_HOST:localhost}
-    password: ${REDIS_PASSWORD:null}
   datasource:
     enabled: ${DATASOURCE_ENABLED:true}
     driverClassName: ${DATASOURCE_DRIVER_CLASS_NAME:org.h2.Driver}
@@ -27,12 +23,17 @@ spring:
     password: ${DATASOURCE_PASSWORD:password}
   jpa:
     hibernate:
-      ddl-auto: ${JPA_HIBERNATE_DDL_AUTO:update}
+      ddl-auto: ${JPA_HIBERNATE_DDL_AUTO:create-drop}
     open-in-view: ${JPA_OPEN_IN_VIEW:false}
+    database-platform: ${JPA_DATABASE_PLATFORM:org.hibernate.dialect.H2Dialect}
   data:
     redis:
+      enabled: ${REDIS_ENABLED:false}
+      host: ${REDIS_HOST:localhost}
+      password: ${REDIS_PASSWORD:null}
       repositories:
         enabled: ${DATA_REDIS_REPOSITORIES_ENABLED:false}
+
 modules:
   user:
     enabled: ${MODULE_USER_ENABLED:true}
@@ -55,5 +56,3 @@ logging:
 springdoc:
   api-docs:
     enabled: ${API_DOCS_ENABLED:true}
-  swagger-ui:
-    path: /swagger-ui

build.gradle.kts

@@ -1,11 +1,11 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.springframework.boot") version "2.7.4" apply false
-    id("io.spring.dependency-management") version "1.0.14.RELEASE" apply false
-    kotlin("jvm") version "1.7.20" apply false
-    kotlin("plugin.spring") version "1.7.20" apply false
-    kotlin("plugin.jpa") version "1.7.20" apply false
+    id("org.springframework.boot") version "3.0.4" apply false
+    id("io.spring.dependency-management") version "1.1.0" apply false
+    kotlin("jvm") version "1.8.10" apply false
+    kotlin("plugin.spring") version "1.8.10" apply false
+    kotlin("plugin.jpa") version "1.8.10" apply false
 }
 
 allprojects {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 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.0.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       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/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # 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"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    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.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,105 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-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
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+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=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=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    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.
+
+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.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

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

lite.Dockerfile

@@ -1,39 +0,0 @@
-# Builder
-FROM cubetiq/openjdk:11u-ubuntu as builder
-LABEL maintainer="sombochea@cubetiqs.com"
-
-WORKDIR /app
-
-RUN apt-get update && apt-get install -y git
-
-COPY . .
-
-RUN sh gradlew clean bootJar
-RUN rm -f build/libs/*-plain.jar
-
-# Build for container image
-FROM bellsoft/liberica-openjre-alpine-musl
-LABEL maintainer="sombochea@cubetiqs.com"
-
-# Setup timezone to Phnom Penh
-RUN ln -sf /usr/share/zoneinfo/Asia/Phnom_Penh /etc/localtime
-RUN echo "Asia/Phnom_Penh" > /etc/timezone
-
-# App root path
-WORKDIR /opt/cubetiq
-
-# App volumn
-VOLUME ["/opt/cubetiq", "/data"]
-
-# Api Module Build Directory
-ARG API_BUILD_DIR=api/build
-
-# Copy the app bundle to the workdir
-COPY --from=builder /app/${API_BUILD_DIR}/libs/api-0.0.1-SNAPSHOT.jar ./api.jar
-
-# App profile will run with
-ENV PROFILE=dev
-ENV APP_DATA_DIR=/data
-
-# Entrypoint to app
-CMD ["java","-jar", "./api.jar"]

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ]
+}

system.properties

@@ -0,0 +1 @@
+java.runtime.version=zulu-17