Fix: Tomcat WAS 취약점 조치

backend/apigateway/build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id 'org.springframework.boot' version '2.4.5'
+    id 'org.springframework.boot' version '2.7.0'
-    id "org.sonarqube" version "2.7"
+    id "org.sonarqube" version "3.3"
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     id 'java'
 }
@@ -14,8 +14,8 @@ repositories {
 }
 
 ext {
-    set('springCloudVersion', "2020.0.3")
+    set('springCloudVersion', "2021.0.3")
-    set('log4j2.version', "2.17.1") // log4j 보안 패치
+    set('log4j2.version', "2.17.2") // log4j 보안 패치
 }
 
 dependencies {
@@ -27,11 +27,12 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-starter-config'    // config
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // config
     implementation 'org.springframework.cloud:spring-cloud-starter-bus-amqp'  // bus
-    implementation 'net.logstash.logback:logstash-logback-encoder:6.6'        // logstash logback
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.73'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.2'        // logstash logback
     implementation 'io.jsonwebtoken:jjwt:0.9.1'
     implementation 'javax.xml.bind:jaxb-api:2.3.1'
 
-    implementation 'org.springdoc:springdoc-openapi-webflux-ui:1.5.8'
+    implementation 'org.springdoc:springdoc-openapi-webflux-ui:1.6.9'
 
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'

backend/apigateway/gradle/wrapper/gradle-wrapper.properties

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

backend/apigateway/src/main/java/org/egovframe/cloud/apigateway/config/ReactiveAuthorization.java

@@ -120,7 +120,7 @@ public class ReactiveAuthorization implements ReactiveAuthorizationManager<Autho
                     httpHeaders.add(HttpHeaders.AUTHORIZATION, token);
                 })
                 .retrieve().bodyToMono(Boolean.class);
-            granted = body.blockOptional().orElse(false);
+            granted = body.toFuture().get().booleanValue();
             log.info("Security AuthorizationDecision granted={}", granted);
         } catch (Exception e) {
             log.error("인가 서버에 요청 중 오류 : {}", e.getMessage());

backend/apigateway/src/main/resources/application.yml

@@ -66,5 +66,11 @@ management:
       exposure:
         include: refresh, health, beans, info
 
+info:
+  app:
+    name: Spring Cloud Gateway
+    description: API <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD>͸<EFBFBD>/<2F><>Ʈ<EFBFBD><C6AE> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϰ<EFBFBD> ȿ<><C8BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+  swagger-ui: http://localhost:8000/webjars/swagger-ui/index.html?configUrl=/v3/api-docs/swagger-config
+
 messages:
   directory: ${user.dir}/msa-attach-volume/messages

backend/board-service/build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id 'org.springframework.boot' version '2.4.5'
+    id 'org.springframework.boot' version '2.7.0'
-    id "org.sonarqube" version "2.7"
+    id "org.sonarqube" version "3.3"
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     // querydsl
     id 'com.ewerk.gradle.plugins.querydsl' version '1.0.10'
@@ -23,14 +23,14 @@ repositories {
 }
 
 ext {
-    set('springCloudVersion', "2020.0.3")
+    set('springCloudVersion', "2021.0.3")
-    set('log4j2.version', "2.17.1") // log4j 보안 패치
+    set('log4j2.version', "2.17.2") // log4j 보안 패치
 }
 
 dependencies {
 //    implementation files('../../module-common/build/libs/module-common-0.1.jar') // 공통 모듈, @ComponentScan(basePackages={"org.egovframe.cloud"}) 추가해야 적용된다
     implementation 'org.egovframe.cloud:module-common:0.1'
-    implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.0.0') {
+    implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.1.0') {
         exclude group: 'org.egovframe.rte', module: 'org.egovframe.rte.fdl.logging'
     }
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
@@ -44,21 +44,25 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-starter-bus-amqp'  // bus
     implementation 'org.springframework.cloud:spring-cloud-starter-sleuth'
     implementation 'org.springframework.cloud:spring-cloud-sleuth-zipkin'
-    implementation 'net.logstash.logback:logstash-logback-encoder:6.6'        // logstash logback
+    implementation 'org.apache.tomcat:tomcat-annotations-api:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-core:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.73'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.2'        // logstash logback
     implementation 'mysql:mysql-connector-java'
     implementation 'io.jsonwebtoken:jjwt:0.9.1'
     // querydsl
-    implementation 'com.querydsl:querydsl-jpa'
+    implementation 'com.querydsl:querydsl-jpa:5.0.0'
-    implementation 'com.querydsl:querydsl-core'
+    annotationProcessor 'com.querydsl:querydsl-apt:5.0.0'
-    implementation 'com.querydsl:querydsl-sql:4.4.0'
+    implementation 'com.querydsl:querydsl-sql:5.0.0'
-    implementation 'com.querydsl:querydsl-sql-spring:4.4.0'
+    implementation 'com.querydsl:querydsl-sql-spring:5.0.0'
 
     //messaging
     implementation 'org.springframework.cloud:spring-cloud-stream'
     implementation 'org.springframework.cloud:spring-cloud-stream-binder-rabbit'
 
     // openapi docs
-    implementation 'org.springdoc:springdoc-openapi-webmvc-core:1.5.8'
+    implementation 'org.springdoc:springdoc-openapi-webmvc-core:1.6.9'
     annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
 
     // lombok
@@ -68,8 +72,10 @@ dependencies {
     testAnnotationProcessor 'org.projectlombok:lombok'
 
     testImplementation 'com.h2database:h2'
-    testImplementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.5.7' // 테스트시에만 출력
+    testImplementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.8.0' // 테스트시에만 출력
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    
+    implementation 'org.javassist:javassist:3.29.0-GA'
 }
 
 dependencyManagement {
@@ -96,5 +102,6 @@ configurations {
 }
 compileQuerydsl {
     options.annotationProcessorPath = configurations.querydsl
+    options.compilerArgs << '-Aquerydsl.generatedAnnotationClass=javax.annotation.Generated'
 }
 // querydsl 추가 끝

backend/board-service/gradle/wrapper/gradle-wrapper.properties

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

backend/board-service/src/main/resources/application.yml

@@ -26,3 +26,8 @@ management:
     web:
       exposure:
         include: refresh, health, beans, info
+
+info:
+  app:
+    name: Board Service
+    description: <EFBFBD>Խ<EFBFBD><EFBFBD>ǰ<EFBFBD><EFBFBD><EFBFBD>, <20>Խù<D4BD><C3B9><EFBFBD><EFBFBD><EFBFBD>, ÷<><C3B7><EFBFBD><EFBFBD><EFBFBD>ϰ<EFBFBD><CFB0><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>

backend/config/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version '2.4.5'
+    id 'org.springframework.boot' version '2.7.0'
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     id 'java'
 }
@@ -13,8 +13,8 @@ repositories {
 }
 
 ext {
-    set('springCloudVersion', "2020.0.3")
+    set('springCloudVersion', "2021.0.3")
-    set('log4j2.version', "2.17.1") // log4j 보안 패치
+    set('log4j2.version', "2.17.2") // log4j 보안 패치
 }
 
 dependencies {
@@ -23,7 +23,11 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'
     implementation 'org.springframework.cloud:spring-cloud-starter-bus-amqp'  // bus
     implementation 'org.springframework.boot:spring-boot-starter-actuator'    // bus
-    implementation 'net.logstash.logback:logstash-logback-encoder:6.6'        // logstash logback
+    implementation 'org.apache.tomcat:tomcat-annotations-api:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-core:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.73'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.2'        // logstash logback
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 

backend/config/gradle/wrapper/gradle-wrapper.properties

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

backend/discovery/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version '2.4.5'
+    id 'org.springframework.boot' version '2.7.0'
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     id 'java'
 }
@@ -13,13 +13,17 @@ repositories {
 }
 
 ext {
-    set('springCloudVersion', "2020.0.3")
+    set('springCloudVersion', "2021.0.3")
-    set('log4j2.version', "2.17.1") // log4j 보안 패치
+    set('log4j2.version', "2.17.2") // log4j 보안 패치
 }
 
 dependencies {
     implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-server'
     implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.apache.tomcat:tomcat-annotations-api:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-core:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.73'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 

backend/discovery/gradle/wrapper/gradle-wrapper.properties

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

backend/module-common/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version '2.4.5'
+    id 'org.springframework.boot' version '2.7.0'
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     // querydsl
     id 'com.ewerk.gradle.plugins.querydsl' version '1.0.10'
@@ -8,7 +8,8 @@ plugins {
 }
 
 group 'org.egovframe.cloud'
-version '0.1'
+version '4.1.0'
+sourceCompatibility = '1.8'
 
 repositories {
     mavenCentral()
@@ -29,13 +30,13 @@ configurations {
 }
 
 ext {
-    set('springCloudVersion', "2020.0.3")
+    set('springCloudVersion', "2021.0.3")
-    set('log4j2.version', "2.17.1") // log4j 보안 패치
+    set('log4j2.version', "2.17.2") // log4j 보안 패치
 }
 
 dependencies {
     // EgovAbstractServiceImpl
-    implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.0.0') {
+    implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.1.0') {
         exclude group: 'org.egovframe.rte', module: 'org.egovframe.rte.fdl.logging'
     }
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
@@ -43,15 +44,19 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-validation' // LocalValidatorFactoryBean
     implementation 'io.jsonwebtoken:jjwt:0.9.1'
+    implementation 'javassist:javassist:3.12.1.GA'
+
     // querydsl
-    implementation 'com.querydsl:querydsl-jpa'
+    implementation 'com.querydsl:querydsl-jpa:5.0.0'
-    implementation 'com.querydsl:querydsl-core'
+    annotationProcessor 'com.querydsl:querydsl-apt:5.0.0'
+    implementation 'com.querydsl:querydsl-sql:5.0.0'
+    implementation 'com.querydsl:querydsl-sql-spring:5.0.0'
 
     //openapi docs
     implementation group: 'io.springfox', name: 'springfox-swagger2', version: '2.9.2'
     implementation group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.9.2'
-    implementation 'org.springdoc:springdoc-openapi-webmvc-core:1.5.8'
+    implementation 'org.springdoc:springdoc-openapi-webmvc-core:1.6.9'
-    implementation 'org.springdoc:springdoc-openapi-webflux-ui:1.5.8'
+    implementation 'org.springdoc:springdoc-openapi-webflux-ui:1.6.9'
 
     //reactive
     implementation 'org.springframework.boot:spring-boot-starter-data-r2dbc'
@@ -93,5 +98,6 @@ configurations {
 }
 compileQuerydsl {
     options.annotationProcessorPath = configurations.querydsl
+    options.compilerArgs << '-Aquerydsl.generatedAnnotationClass=javax.annotation.Generated'
 }
 // querydsl 추가 끝

backend/portal-service/build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id 'org.springframework.boot' version '2.4.5'
+    id 'org.springframework.boot' version '2.7.0'
-    id "org.sonarqube" version "2.7"
+    id "org.sonarqube" version "3.3"
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     // querydsl
     id 'com.ewerk.gradle.plugins.querydsl' version '1.0.10'
@@ -23,14 +23,14 @@ repositories {
 }
 
 ext {
-    set('springCloudVersion', "2020.0.3")
+    set('springCloudVersion', "2021.0.3")
-    set('log4j2.version', "2.17.1") // log4j 보안 패치
+    set('log4j2.version', "2.17.2") // log4j 보안 패치
 }
 
 dependencies {
 //    implementation files('../../module-common/build/libs/module-common-0.1.jar') // 공통 모듈, @ComponentScan(basePackages={"org.egovframe.cloud"}) 추가해야 적용된다
     implementation 'org.egovframe.cloud:module-common:0.1'
-    implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.0.0') {
+    implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.1.0') {
         exclude group: 'org.egovframe.rte', module: 'org.egovframe.rte.fdl.logging'
     }
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
@@ -46,7 +46,11 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-sleuth-zipkin'
     implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
     implementation 'org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j'
-    implementation 'net.logstash.logback:logstash-logback-encoder:6.6'        // logstash logback
+    implementation 'org.apache.tomcat:tomcat-annotations-api:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-core:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.73'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.2'        // logstash logback
     implementation 'commons-net:commons-net:3.8.0' // FTPClient
     implementation 'mysql:mysql-connector-java'
     implementation 'io.jsonwebtoken:jjwt:0.9.1'
@@ -56,11 +60,11 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-stream-binder-rabbit'
 
     // querydsl
-    implementation 'com.querydsl:querydsl-jpa'
+    implementation 'com.querydsl:querydsl-jpa:5.0.0'
-    implementation 'com.querydsl:querydsl-core'
+    annotationProcessor 'com.querydsl:querydsl-apt:5.0.0'
 
     // openapi docs
-    implementation 'org.springdoc:springdoc-openapi-webmvc-core:1.5.8'
+    implementation 'org.springdoc:springdoc-openapi-webmvc-core:1.6.9'
     annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
 
     // lombok
@@ -70,8 +74,10 @@ dependencies {
     testAnnotationProcessor 'org.projectlombok:lombok'
 
     testImplementation 'com.h2database:h2'
-    testImplementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.5.7' // 테스트시에만 출력
+    testImplementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.8.0' // 테스트시에만 출력
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    
+    implementation 'org.javassist:javassist:3.29.0-GA'
 }
 
 dependencyManagement {
@@ -98,5 +104,6 @@ configurations {
 }
 compileQuerydsl {
     options.annotationProcessorPath = configurations.querydsl
+    options.compilerArgs << '-Aquerydsl.generatedAnnotationClass=javax.annotation.Generated'
 }
 // querydsl 추가 끝

backend/portal-service/gradle/wrapper/gradle-wrapper.properties

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

backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/domain/statistics/StatisticsRepository.java

@@ -22,6 +22,6 @@ import java.util.List;
  *  2021/09/07    shinmj      최초 생성
  * </pre>
  */
-public interface StatisticsRepository extends JpaRepository<Statistics, Long>, StatisticsRepositoryCustom {
+public interface StatisticsRepository extends JpaRepository<Statistics, String>, StatisticsRepositoryCustom {
 
 }

backend/portal-service/src/main/resources/application.yml

@@ -27,7 +27,11 @@ management:
       exposure:
         include: refresh, health, beans, info
 
+info:
+  app:
+    name: Portal Service
+    description: 메뉴관리, 권한관리, 공통코드관리 및 컨텐츠관리 등의 기능을 제공
+
 logging:
   level:
     org.egovframe.cloud.portalservice.client: DEBUG   # Feign log를 확인하기 위해 해당 패키지를 디버그 모드로 설정
-

backend/reserve-check-service/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version '2.4.5'
+    id 'org.springframework.boot' version '2.7.0'
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     id 'java'
 }
@@ -20,14 +20,14 @@ repositories {
 }
 
 ext {
-    set('springCloudVersion', "2020.0.3")
+    set('springCloudVersion', "2021.0.3")
-    set('log4j2.version', "2.17.1") // log4j 보안 패치
+    set('log4j2.version', "2.17.2") // log4j 보안 패치
 }
 
 dependencies {
 //    implementation files('../../module-common/build/libs/module-common-0.1.jar') // @ComponentScan(basePackages={"org.egovframe.cloud"}) 추가해야 적용된다
     implementation 'org.egovframe.cloud:module-common:0.1'
-    implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.0.0') {
+    implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.1.0') {
         exclude group: 'org.egovframe.rte', module: 'org.egovframe.rte.fdl.logging'
     }
     implementation 'org.springframework.boot:spring-boot-starter-data-r2dbc'
@@ -40,11 +40,12 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // config
     implementation 'org.springframework.cloud:spring-cloud-starter-bus-amqp'  // bus
     implementation 'org.springframework.cloud:spring-cloud-starter-circuitbreaker-reactor-resilience4j'
-    implementation 'com.playtika.reactivefeign:feign-reactor-spring-cloud-starter:3.1.0'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.73'
+    implementation 'com.playtika.reactivefeign:feign-reactor-spring-cloud-starter:3.2.1'
 
     implementation 'org.springframework.cloud:spring-cloud-starter-sleuth'
     implementation 'org.springframework.cloud:spring-cloud-sleuth-zipkin'
-    implementation 'net.logstash.logback:logstash-logback-encoder:6.6'        // logstash logback
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.2'        // logstash logback
 
     //messaging
     implementation 'org.springframework.cloud:spring-cloud-stream'
@@ -56,7 +57,7 @@ dependencies {
     implementation 'mysql:mysql-connector-java'
 
     // openapi docs
-    implementation 'org.springdoc:springdoc-openapi-webflux-ui:1.5.8'
+    implementation 'org.springdoc:springdoc-openapi-webflux-ui:1.6.9'
 
     //lombok
     implementation 'org.projectlombok:lombok'

backend/reserve-check-service/gradle/wrapper/gradle-wrapper.properties

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

backend/reserve-check-service/src/main/resources/application.yml

@@ -12,3 +12,7 @@ management:
       exposure:
         include: refresh, health, beans, info
 
+info:
+  app:
+    name: Reserve Check Service
+    description: <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ý<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD>Ȯ<EFBFBD><C8AE>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>

backend/reserve-item-service/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version '2.4.5'
+    id 'org.springframework.boot' version '2.7.0'
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     id 'java'
 }
@@ -20,14 +20,14 @@ repositories {
 }
 
 ext {
-    set('springCloudVersion', "2020.0.3")
+    set('springCloudVersion', "2021.0.3")
-    set('log4j2.version', "2.17.1") // log4j 보안 패치
+    set('log4j2.version', "2.17.2") // log4j 보안 패치
 }
 
 dependencies {
 //    implementation files('../../module-common/build/libs/module-common-0.1.jar') // @ComponentScan(basePackages={"org.egovframe.cloud"}) 추가해야 적용된다
     implementation 'org.egovframe.cloud:module-common:0.1'
-    implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.0.0') {
+    implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.1.0') {
         exclude group: 'org.egovframe.rte', module: 'org.egovframe.rte.fdl.logging'
     }
     implementation 'org.springframework.boot:spring-boot-starter-data-r2dbc'
@@ -40,19 +40,20 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // config
     implementation 'org.springframework.cloud:spring-cloud-starter-bus-amqp'  // bus
     implementation 'org.springframework.cloud:spring-cloud-starter-circuitbreaker-reactor-resilience4j'
-    implementation 'com.playtika.reactivefeign:feign-reactor-spring-cloud-starter:3.1.0'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.73'
+    implementation 'com.playtika.reactivefeign:feign-reactor-spring-cloud-starter:3.2.1'
 
     implementation 'io.jsonwebtoken:jjwt:0.9.1'
 
     implementation 'org.springframework.cloud:spring-cloud-starter-sleuth'
     implementation 'org.springframework.cloud:spring-cloud-sleuth-zipkin'
-    implementation 'net.logstash.logback:logstash-logback-encoder:6.6'        // logstash logback
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.2'        // logstash logback
 
     implementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
     implementation 'mysql:mysql-connector-java'
 
     // openapi docs
-    implementation 'org.springdoc:springdoc-openapi-webflux-ui:1.5.8'
+    implementation 'org.springdoc:springdoc-openapi-webflux-ui:1.6.9'
 
     //messaging
     implementation 'org.springframework.cloud:spring-cloud-stream'

backend/reserve-item-service/gradle/wrapper/gradle-wrapper.properties

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

backend/reserve-item-service/src/main/resources/application.yml

@@ -11,3 +11,8 @@ management:
     web:
       exposure:
         include: refresh, health, beans, info
+
+info:
+  app:
+    name: Reserve Item Service
+    description: <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ý<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD>๰ǰ <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>

backend/reserve-request-service/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version '2.4.5'
+    id 'org.springframework.boot' version '2.7.0'
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     id 'java'
 }
@@ -20,15 +20,15 @@ repositories {
 }
 
 ext {
-    set('springCloudVersion', "2020.0.3")
+    set('springCloudVersion', "2021.0.3")
-    set('log4j2.version', "2.17.1") // log4j 보안 패치
+    set('log4j2.version', "2.17.2") // log4j 보안 패치
 }
 
 
 dependencies {
 //    implementation files('../../module-common/build/libs/module-common-0.1.jar') // @ComponentScan(basePackages={"org.egovframe.cloud"}) 추가해야 적용된다
     implementation 'org.egovframe.cloud:module-common:0.1'
-    implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.0.0') {
+    implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.1.0') {
         exclude group: 'org.egovframe.rte', module: 'org.egovframe.rte.fdl.logging'
     }
     implementation 'org.springframework.boot:spring-boot-starter-data-r2dbc'
@@ -41,11 +41,12 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // config
     implementation 'org.springframework.cloud:spring-cloud-starter-bus-amqp'  // bus
     implementation 'org.springframework.cloud:spring-cloud-starter-circuitbreaker-reactor-resilience4j'
-    implementation 'com.playtika.reactivefeign:feign-reactor-spring-cloud-starter:3.1.0'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.73'
+    implementation 'com.playtika.reactivefeign:feign-reactor-spring-cloud-starter:3.2.1'
 
     implementation 'org.springframework.cloud:spring-cloud-starter-sleuth'
     implementation 'org.springframework.cloud:spring-cloud-sleuth-zipkin'
-    implementation 'net.logstash.logback:logstash-logback-encoder:6.6'        // logstash logback
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.2'        // logstash logback
 
     //messaging
     implementation 'org.springframework.cloud:spring-cloud-stream'
@@ -59,7 +60,7 @@ dependencies {
     implementation 'mysql:mysql-connector-java'
 
     // openapi docs
-    implementation 'org.springdoc:springdoc-openapi-webflux-ui:1.5.8'
+    implementation 'org.springdoc:springdoc-openapi-webflux-ui:1.6.9'
 
     //lombok
     implementation 'org.projectlombok:lombok'

backend/reserve-request-service/gradle/wrapper/gradle-wrapper.properties

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

backend/reserve-request-service/src/main/resources/application.yml

@@ -11,3 +11,8 @@ management:
     web:
       exposure:
         include: refresh, health, beans, info
+
+info:
+  app:
+    name: Reserve Request Service
+    description: <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ý<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>

backend/user-service/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version '2.4.5'
+    id 'org.springframework.boot' version '2.7.0'
     id "org.sonarqube" version "2.7"
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     // querydsl
@@ -23,14 +23,14 @@ repositories {
 }
 
 ext {
-    set('springCloudVersion', "2020.0.3")
+    set('springCloudVersion', "2021.0.3")
-    set('log4j2.version', "2.17.1") // log4j 보안 패치
+    set('log4j2.version', "2.17.2") // log4j 보안 패치
 }
 
 dependencies {
 //    implementation files('../../module-common/build/libs/module-common-0.1.jar') // 공통 모듈, @ComponentScan(basePackages={"org.egovframe.cloud"}) 추가해야 적용된다
     implementation 'org.egovframe.cloud:module-common:0.1'
-    implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.0.0') {
+    implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.1.0') {
         exclude group: 'org.egovframe.rte', module: 'org.egovframe.rte.fdl.logging'
     }
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
@@ -46,21 +46,25 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-starter-bus-amqp'  // bus
     implementation 'org.springframework.cloud:spring-cloud-starter-sleuth'
     implementation 'org.springframework.cloud:spring-cloud-sleuth-zipkin'
-    implementation 'net.logstash.logback:logstash-logback-encoder:6.6'        // logstash logback
+    implementation 'org.apache.tomcat:tomcat-annotations-api:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-core:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.73'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.2'        // logstash logback
     implementation 'mysql:mysql-connector-java'
     implementation 'io.jsonwebtoken:jjwt:0.9.1'
     // querydsl
-    implementation 'com.querydsl:querydsl-jpa'
+    implementation 'com.querydsl:querydsl-jpa:5.0.0'
-    implementation 'com.querydsl:querydsl-core'
+    annotationProcessor 'com.querydsl:querydsl-apt:5.0.0'
     // cache
     implementation 'org.springframework.boot:spring-boot-starter-cache'
     implementation 'org.ehcache:ehcache'
     implementation 'javax.cache:cache-api' // expiry를 위해 필요
 
-    implementation 'com.google.api-client:google-api-client:1.32.1'
+    implementation 'com.google.api-client:google-api-client:1.35.1'
 
     // openapi docs
-    implementation 'org.springdoc:springdoc-openapi-webmvc-core:1.5.8'
+    implementation 'org.springdoc:springdoc-openapi-webmvc-core:1.6.9'
     annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
 
     // lombok
@@ -69,9 +73,11 @@ dependencies {
     testImplementation 'org.projectlombok:lombok'
     testAnnotationProcessor 'org.projectlombok:lombok'
     testImplementation 'com.h2database:h2'
-    testImplementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.5.7'
+    testImplementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.8.0'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'
+    
+    implementation 'org.javassist:javassist:3.29.0-GA'
 }
 
 dependencyManagement {
@@ -98,5 +104,6 @@ configurations {
 }
 compileQuerydsl {
     options.annotationProcessorPath = configurations.querydsl
+    options.compilerArgs << '-Aquerydsl.generatedAnnotationClass=javax.annotation.Generated'
 }
 // querydsl 추가 끝

backend/user-service/gradle/wrapper/gradle-wrapper.properties

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

backend/user-service/src/main/java/org/egovframe/cloud/userservice/domain/role/RoleRepository.java

@@ -19,5 +19,5 @@ import org.springframework.data.jpa.repository.JpaRepository;
  *  2021/07/07    jooho       최초 생성
  * </pre>
  */
-public interface RoleRepository extends JpaRepository<Role, String>, RoleRepositoryCustom {
+public interface RoleRepository extends JpaRepository<Role, Long>, RoleRepositoryCustom {
 }

backend/user-service/src/main/resources/application.yml

@@ -73,3 +73,8 @@ management:
   health:
     mail:
       enabled: false
+
+info:
+  app:
+    name: User Service
+    description: 로그인, 회원관리 및 관리자 기능을 제공