Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 9 additions & 18 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot' version '2.7.9'
id 'org.springframework.boot' version '3.2.12'
id 'io.spring.dependency-management' version '1.0.15.RELEASE'
id 'com.google.cloud.tools.jib' version '3.3.1'
}
Expand All @@ -24,9 +24,7 @@ dependencies {
implementation 'org.springframework.session:spring-session-core'
implementation 'com.squareup.okhttp3:okhttp:4.10.0'

// https://mvnrepository.com/artifact/com.h2database/h2
// 시작 시 drop TABLE관련 버그로 1.4.200 -> 1.4.199
implementation group: 'com.h2database', name: 'h2', version: '1.4.199'
implementation 'com.h2database:h2'
//implementation 'org.projectlombok:lombok:1.18.26'
// lombok이 제대로 작동되지 않으면 아래처럼(@Getter/@Setter등이 안먹을때)
compileOnly group : 'org.projectlombok', name: 'lombok', version: '1.18.22'
Expand All @@ -37,35 +35,23 @@ dependencies {

testImplementation 'org.springframework.boot:spring-boot-starter-test'

implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.18'
implementation('org.json:json:20180813')
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
implementation group: 'com.jcraft', name: 'jsch', version: '0.1.55'
implementation('io.springfox:springfox-swagger2:2.6.1')
implementation('io.springfox:springfox-swagger-ui:2.6.1')

//implementation('org.mariadb.jdbc:mariadb-java-client')
//implementation('org.mybatis.spring.boot:mybatis-spring-boot-starter:2.0.1')
implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '5.7.0.202003110725-r'
implementation group: 'org.w3c', name: 'dom', version: '2.3.0-jaxb-1.0.6'

implementation 'org.springdoc:springdoc-openapi-ui:1.6.9'

implementation group: 'org.yaml', name: 'snakeyaml', version: '1.30'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'

// skip openshift ssl certificate verfication
implementation 'org.apache.httpcomponents:httpclient:4.5.12'
// additional
implementation 'org.apache.commons:commons-lang3:3.9'

// 취약점 처리 22.07.05
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.13.3'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jdk8', version: '2.13.3'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.13.3'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.3'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.13.3'
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.13.3'
implementation group: 'commons-io', name: 'commons-io', version: '2.11.0'
implementation group: 'junit', name: 'junit', version: '4.13.2'
implementation 'javax.xml.bind:jaxb-api:2.3.1'
Expand All @@ -74,7 +60,12 @@ dependencies {

// Jenkins 2024-07-16
//Jenkins-Rest ( https://github.com/cdancy/jenkins-rest )
implementation 'io.github.cdancy:jenkins-rest:1.0.1:all'
implementation('io.github.cdancy:jenkins-rest:1.0.1:all') {
exclude group: 'com.fasterxml.jackson.core'
exclude group: 'com.fasterxml.jackson.datatype'
exclude group: 'com.fasterxml.jackson.dataformat'
}
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'



Expand Down
2 changes: 0 additions & 2 deletions src/main/java/kr/co/mcmp/WorkflowManagerApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import springfox.documentation.swagger2.annotations.EnableSwagger2;

import java.io.UnsupportedEncodingException;
import java.security.GeneralSecurityException;

@EnableSwagger2
@SpringBootApplication
public class WorkflowManagerApplication {
public static void main(String[] args) throws GeneralSecurityException, UnsupportedEncodingException {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/kr/co/mcmp/config/SimpleCORSFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;

import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.*;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;

/**
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/kr/co/mcmp/config/SwaggerConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
import io.swagger.v3.oas.models.security.SecurityScheme;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.swagger2.annotations.EnableSwagger2;

@Configuration
@EnableSwagger2
@OpenAPIDefinition(info = @Info(title = "M-CMP API", version = "v1"))
public class SwaggerConfig {

Expand Down
11 changes: 3 additions & 8 deletions src/main/java/kr/co/mcmp/config/TomcatWebServerCustomizer.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package kr.co.mcmp.config;

import org.apache.catalina.connector.Connector;
import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
import org.springframework.stereotype.Component;
Expand All @@ -11,11 +9,8 @@ public class TomcatWebServerCustomizer implements WebServerFactoryCustomizer<Tom

@Override
public void customize(TomcatServletWebServerFactory factory) {
factory.addConnectorCustomizers(new TomcatConnectorCustomizer() {
@Override
public void customize(Connector connector) {
connector.setAttribute("relaxedQueryChars", "|{}[]");
}
});
factory.addConnectorCustomizers(connector ->
connector.setProperty("relaxedQueryChars", "|{}[]")
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import kr.co.mcmp.workflow.Entity.Workflow;
import lombok.*;

import javax.persistence.*;
import jakarta.persistence.*;

@Entity
@Getter
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kr/co/mcmp/oss/entity/Oss.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import lombok.*;

import javax.persistence.*;
import jakarta.persistence.*;

@Entity
@Getter
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kr/co/mcmp/oss/entity/OssType.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import lombok.*;

import javax.persistence.*;
import jakarta.persistence.*;

@Entity
@Getter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import lombok.*;

import javax.persistence.*;
import jakarta.persistence.*;
import java.time.LocalDateTime;

@Entity
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kr/co/mcmp/workflow/Entity/Workflow.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import kr.co.mcmp.oss.entity.Oss;
import lombok.*;

import javax.persistence.*;
import jakarta.persistence.*;

@Entity
@Getter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import lombok.*;

import javax.persistence.*;
import jakarta.persistence.*;
import java.time.LocalDateTime;

@Entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import lombok.*;
import org.hibernate.annotations.ColumnDefault;

import javax.persistence.*;
import jakarta.persistence.*;

@Entity
@Getter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import lombok.*;

import javax.persistence.*;
import jakarta.persistence.*;
import java.time.LocalDateTime;

@Entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import lombok.*;

import javax.persistence.*;
import jakarta.persistence.*;

@Entity
@Getter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import lombok.*;

import javax.persistence.*;
import jakarta.persistence.*;

@Entity
@Getter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import lombok.*;

import javax.persistence.*;
import jakarta.persistence.*;

@Entity
@Getter
Expand Down
9 changes: 2 additions & 7 deletions src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,21 @@ spring:
settings:
web-allow-others: true # 원격연결(배포 후 외부에서) 허용
jpa:
database-platform: org.hibernate.dialect.H2Dialect
hibernate:
ddl-auto: ${DB_INIT_YN:update}
properties:
hibernate:
dialect: org.hibernate.dialect.H2Dialect
format_sql: true
show_sql: true
hbm2ddl: # 처음에 더미데이터등을 넣기위해 sql을 실행
#import_files: ./data.sql # 확인필요
hbm2ddl:
import_files: classpath:import.sql
import_files_sql_extractor: org.hibernate.tool.hbm2ddl.MultipleLinesSqlCommandExtractor # 멀티 라인 입력 가능하도록
connection:
charSet: UTF-8 # 인코딩 설정
charSet: UTF-8
sql:
init:
data-locations: classpath:import.sql
mode: always # ${SQL_DATA_INIT:never}
platform: h2
#schema-locations: classpath:ddl.sql

servlet:
multipart:
Expand Down
Loading