diff --git a/pom.xml b/pom.xml index 2f2718f..33084b1 100644 --- a/pom.xml +++ b/pom.xml @@ -1,64 +1,66 @@ - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 4.0.0 - - - com.CSO2 - content-service - 0.0.1-SNAPSHOT - content-service - content-service of CSO2 - - - - - - - - - - - - - - - 17 - 1.18.42 - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.2.5 + + com.CSO2 + content-service + 0.0.1-SNAPSHOT + content-service + content-service of CSO2 - - org.springframework.boot - spring-boot-starter-web - + + 17 + 1.18.42 + 2023.0.0 - - org.springframework.boot - spring-boot-devtools - true - + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + org.springframework.cloud + spring-cloud-starter-vault-config + - - org.projectlombok - lombok - ${lombok.version} - true - - - org.springframework.boot - spring-boot-starter-test - test - org.springframework.boot spring-boot-starter-data-mongodb + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + true + + + org.projectlombok + lombok + ${lombok.version} + true + + + org.springframework.boot + spring-boot-starter-test + test + com.fasterxml.jackson.core jackson-databind @@ -69,34 +71,33 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - org.projectlombok - lombok - ${lombok.version} - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + ${lombok.version} + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index fe53450..0000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,6 +0,0 @@ -spring.application.name=content-service -server.port=${SERVER_PORT:8086} - -# MongoDB Configuration (override via env vars in production) -spring.data.mongodb.uri=${MONGODB_URI:mongodb://localhost:27017/CSO2_content_service} - diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..d87977d --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,29 @@ +# --- Content Service --- +spring: + application: + name: content-service + + # 1. Load Vault + config: + import: "optional:vault://" + + # 2. Vault Config + cloud: + vault: + enabled: true + uri: http://localhost:8200 + token: my-root-token + kv: + enabled: true + backend: kv + default-context: cs02-app + authentication: TOKEN + + # 3. Database Config (Specific variable for Content Service) + data: + mongodb: + uri: ${content_mongodb_uri:mongodb://localhost:27017/CSO2_content_service} + +# --- Server Port --- +server: + port: 8086 \ No newline at end of file