Compare commits

...

No commits in common. "main" and "trunk" have entirely different histories.
main ... trunk

9 changed files with 12 additions and 55 deletions

View File

@ -3,11 +3,9 @@ plugins {
id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'io.spring.dependency-management' version '1.0.11.RELEASE'
id 'java' id 'java'
} }
// Spring Cloud : 2020.0.x aka Ilford
// Spring Boot : 2.4.x, 2.5.x (Starting with 2020.0.3)
group = 'com.kakaoent.adp.trevi.configserver' group = 'com.kakaoent.cpdd'
version = '1.0.0' version = '0.0.1-SNAPSHOT'
sourceCompatibility = '11' sourceCompatibility = '11'
repositories { repositories {

View File

@ -1,4 +1,4 @@
package com.kakaoent.adp.trevi.configserver; package com.kakaoent.cpdd.config.server;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
@ -6,10 +6,10 @@ import org.springframework.cloud.config.server.EnableConfigServer;
@EnableConfigServer @EnableConfigServer
@SpringBootApplication @SpringBootApplication
public class TreviCloudConfigServerApplication { public class ConfigServerApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(TreviCloudConfigServerApplication.class, args); SpringApplication.run(ConfigServerApplication.class, args);
} }
} }

View File

@ -1,7 +0,0 @@
spring:
config:
activate:
on-profile: dev
logging.level:
org.springframework.cloud.config: DEBUG

View File

@ -1,7 +0,0 @@
spring:
config:
activate:
on-profile: local
logging.level:
org.springframework.cloud.config: TRACE

View File

@ -1,7 +0,0 @@
spring:
config:
activate:
on-profile: prod
logging.level:
org.springframework.cloud.config: INFO

View File

@ -1,7 +0,0 @@
spring:
config:
activate:
on-profile: qa
logging.level:
org.springframework.cloud.config: INFO

View File

@ -1,7 +0,0 @@
spring:
config:
activate:
on-profile: stage
logging.level:
org.springframework.cloud.config: INFO

View File

@ -1,19 +1,13 @@
server: server:
port: 11080 port: 11080
spring: spring:
profiles:
active: local
cloud: cloud:
config: config:
server: server:
git: git:
uri: git@github.com:kakaoent/adp-config-server-config.git uri: https://git.myoa-universe.com/OutworldDestroyer/config-server-pilot-config.git
default-label: main default-label: trunk
search-paths: '{application}/{profile},{application}' search-paths: '{application}/{profile},{application}'
# private-key: ${parsedPrivateKey}
# private-key-raw: ${CONFIG_SERVER_PRIVATE_KEY} logging.level:
ignore-local-ssh-settings: true org.springframework.cloud.config: TRACE
# host-key-algorithm: ssh-rsa
private-key: |
-----BEGIN EC PRIVATE KEY-----
-----END EC PRIVATE KEY-----

View File

@ -1,10 +1,10 @@
package com.kakaoent.adp.trevi.configserver; package com.kakaoent.cpdd.config.server;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest @SpringBootTest
class TreviCloudConfigServerApplicationTests { class ConfigServerApplicationTests {
@Test @Test
void contextLoads() { void contextLoads() {