README.md

@@ -8,8 +8,8 @@
 
 ### Language and Framework
 
-- Spring Boot: 2.7.0
-- Kotlin: 1.7.0
+- Spring Boot: 2.6.7
+- Kotlin: 1.6.21
 - Gradle: 7.4.1
 
 # Modules
@@ -140,6 +140,7 @@ spring:
 ```
 
 - H2 (Embedded)
+-
 
 ```yaml
 spring:

api/build.gradle.kts

@@ -8,8 +8,8 @@ plugins {
 	kotlin("plugin.jpa")
 }
 
-val kotlinVersion = "1.7.0"
-val springBootVersion = "2.7.0"
+val kotlinVersion = "1.6.21"
+val springBootVersion = "2.6.7"
 
 // find the last commit
 fun getGitHashLastCommit(): String {
@@ -38,7 +38,7 @@ dependencies {
 	implementation("org.springframework.boot:spring-boot-starter-data-redis")
 
 	// Migrating from SpringFox
-	implementation("org.springdoc:springdoc-openapi-ui:1.6.9")
+	implementation("org.springdoc:springdoc-openapi-ui:1.6.7")
 
 	// SPRING FRAMEWORK AND CORE
 	implementation("org.springframework.boot:spring-boot-starter-web")
@@ -51,7 +51,7 @@ dependencies {
 	implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 
 	runtimeOnly("com.h2database:h2")
-	// runtimeOnly("org.postgresql:postgresql")
+	runtimeOnly("org.postgresql:postgresql")
 
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
 }

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

@@ -12,13 +12,10 @@ 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.springframework.boot.autoconfigure.condition.ConditionalOnProperty
-
 //import org.springdoc.core.SpringDocUtils
 //import org.springdoc.core.converters.models.Pageable
 //import javax.servlet.http.HttpServletRequest
 
-@ConditionalOnProperty(name = ["springdoc.api-docs.enabled"], havingValue = "true")
 @Configuration
 @SecurityScheme(
     name = "bearerAuth",

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

@@ -2,5 +2,5 @@ package com.cubetiqs.web.modules.uploader
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 
-@ConditionalOnProperty(name = ["modules.uploader.enabled", "spring.datasource.enabled"], havingValue = "true")
+@ConditionalOnProperty(name = ["module.uploader.enabled", "spring.datasource.enabled"], havingValue = "true")
 annotation class UploaderModule

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

@@ -2,5 +2,5 @@ package com.cubetiqs.web.modules.user
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 
-@ConditionalOnProperty(name = ["modules.user.enabled", "spring.datasource.enabled"], havingValue = "true")
+@ConditionalOnProperty(name = ["module.user.enabled", "spring.datasource.enabled"], havingValue = "true")
 annotation class UserModule

api/src/main/resources/application-demo.yml

@@ -1 +0,0 @@
-# Custom props with dev's profile

api/src/main/resources/application.yml

@@ -28,12 +28,8 @@ spring:
   jpa:
     hibernate:
       ddl-auto: ${JPA_HIBERNATE_DDL_AUTO:update}
-    open-in-view: ${JPA_OPEN_IN_VIEW:false}
-  data:
-    redis:
-      repositories:
-        enabled: ${DATA_REDIS_REPOSITORIES_ENABLED:false}
-modules:
+
+module:
   user:
     enabled: ${MODULE_USER_ENABLED:true}
   uploader:
@@ -54,6 +50,6 @@ logging:
 
 springdoc:
   api-docs:
-    enabled: ${API_DOCS_ENABLED:true}
+    enabled: true
   swagger-ui:
     path: /swagger-ui

build.gradle.kts

@@ -1,16 +1,25 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.springframework.boot") version "2.7.0" apply false
+    id("org.springframework.boot") version "2.6.7" apply false
     id("io.spring.dependency-management") version "1.0.11.RELEASE" apply false
-    kotlin("jvm") version "1.7.0" apply false
-    kotlin("plugin.spring") version "1.7.0" apply false
-    kotlin("plugin.jpa") version "1.7.0" apply false
+    kotlin("jvm") version "1.6.21" apply false
+    kotlin("plugin.spring") version "1.6.21" apply false
+    kotlin("plugin.jpa") version "1.6.21" apply false
 }
 
 allprojects {
+    // Fixed Zero-Day CVE-2021-44228: https://cubetiq.atlassian.net/browse/CERT-1
+    // Fixed Zero-Day CVE-2021-45046: https://cubetiq.atlassian.net/browse/CERT-3
+    // Fixed Zero-Day CVE-2021-45105: https://cubetiq.atlassian.net/browse/CERT-4
+    ext["log4j2.version"] = "2.17.0"
+
+    // Fixed Zero-Day CVE-2021-42550: https://cubetiq.atlassian.net/browse/CERT-5
+    ext["logback.version"] = "1.2.9"
+
     repositories {
         mavenCentral()
+        maven("https://m.ctdn.net")
     }
 
     group = "com.cubetiqs"
@@ -20,6 +29,7 @@ allprojects {
 
     tasks.withType<JavaCompile> {
         sourceCompatibility = javaVersion
+        targetCompatibility = javaVersion
     }
 
     tasks.withType<KotlinCompile> {
@@ -40,4 +50,4 @@ subprojects {
             mavenBom(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)
         }
     }
-}
+}

gradle/wrapper/gradle-wrapper.properties

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