diff --git a/pom.xml b/pom.xml index c160a0c..d44390e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,246 +1,268 @@ - 4.0.0 - - dev.mars3142.fhq - website - website - 1.0-SNAPSHOT - jar + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + dev.mars3142.fhq + website + website + 1.0-SNAPSHOT + jar - - 21 - 24.5.0.beta3 - 2023.0.1 - 5.4.1 - 1.2.4 - + + 21 + 24.5.0.beta3 + 2023.0.3 + 5.4.1 + 1.2.4 + - - org.springframework.boot - spring-boot-starter-parent - 3.3.4 - + + org.springframework.boot + spring-boot-starter-parent + 3.3.4 + - - - vaadin-prereleases - https://maven.vaadin.com/vaadin-prereleases - - true - - - - Vaadin Directory - https://maven.vaadin.com/vaadin-addons - - false - - - + + + vaadin-prereleases + https://maven.vaadin.com/vaadin-prereleases + + true + + + + Vaadin Directory + https://maven.vaadin.com/vaadin-addons + + false + + + - - - vaadin-prereleases - https://maven.vaadin.com/vaadin-prereleases - - true - - - - - - - - com.vaadin - vaadin-bom - ${vaadin.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - org.springframework.modulith - spring-modulith-bom - ${spring-modulith.version} - pom - import - - - + + + vaadin-prereleases + https://maven.vaadin.com/vaadin-prereleases + + true + + + + - - com.vaadin - - vaadin - - - com.vaadin - vaadin-spring-boot-starter - - - org.parttio - line-awesome - 2.0.0 - - - - org.springframework.boot - spring-boot-devtools - true - - - org.springframework.boot - spring-boot-starter-test - test - - - com.vaadin - vaadin-testbench-junit5 - test - - - org.projectlombok - lombok - annotationProcessor - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.modulith - spring-modulith-starter-core - - - org.springframework.modulith - spring-modulith-starter-test - test - - - org.springframework.modulith - spring-modulith-actuator - runtime - - - org.springframework.modulith - spring-modulith-observability - runtime - + + com.vaadin + vaadin-bom + ${vaadin.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + org.springframework.modulith + spring-modulith-bom + ${spring-modulith.version} + pom + import + + - - spring-boot:run + + + com.vaadin + + vaadin + + + com.vaadin + vaadin-spring-boot-starter + + + org.parttio + line-awesome + 2.0.0 + + + + org.springframework.boot + spring-boot-devtools + true + + + org.springframework.boot + spring-boot-starter-test + test + + + com.vaadin + vaadin-testbench-junit5 + test + + + org.projectlombok + lombok + annotationProcessor + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.modulith + spring-modulith-starter-core + + + org.springframework.modulith + spring-modulith-starter-test + test + + + org.springframework.modulith + spring-modulith-actuator + runtime + + + org.springframework.modulith + spring-modulith-observability + runtime + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + + + + + spring-boot:run + + + org.springframework.boot + spring-boot-maven-plugin + + + + com.vaadin + vaadin-maven-plugin + ${vaadin.version} + + + + prepare-frontend + + + + + + io.sentry + sentry-maven-plugin + 0.0.8 + + true + + + + + + + uploadSourceBundle + + + + + + + + + + + production + + + + com.vaadin + vaadin-core + + + com.vaadin + vaadin-dev + + + + + - - org.springframework.boot - spring-boot-maven-plugin - - - - com.vaadin - vaadin-maven-plugin - ${vaadin.version} - - - - prepare-frontend - - - - + + com.vaadin + vaadin-maven-plugin + ${vaadin.version} + + + + build-frontend + + compile + + + - + + - - - - production - - - - com.vaadin - vaadin-core - - - com.vaadin - vaadin-dev - - - - - - - - com.vaadin - vaadin-maven-plugin - ${vaadin.version} - - - - build-frontend - - compile - - - - - - + + it + + + + org.springframework.boot + spring-boot-maven-plugin + + + start-spring-boot + pre-integration-test + + start + + + + stop-spring-boot + post-integration-test + + stop + + + + - - it - - - - org.springframework.boot - spring-boot-maven-plugin - - - start-spring-boot - pre-integration-test - - start - - - - stop-spring-boot - post-integration-test - - stop - - - - + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-test + verify + + + + + false + true + + + + + - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - false - true - - - - - - - + diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml index 01df4d0..10dfc42 100644 --- a/src/main/resources/application-dev.yaml +++ b/src/main/resources/application-dev.yaml @@ -8,3 +8,8 @@ vaadin: backend: uri: http://localhost:8091/v1 + +eureka: + client: + service-url: + defaultZone: http://localhost:8761/eureka diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 175e134..9216e25 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,11 +1,10 @@ -server: - port: ${PORT:8080} - logging: level: org:atmosphere: warn spring: + application: + name: website mustache: check-template-location: false jpa: @@ -13,3 +12,41 @@ spring: backend: uri: https://api.firmware-hq.dev/v1 + +eureka: + client: + register-with-eureka: true + fetch-registry: true + service-url: + defaultZone: http://eureka-service.web:8761/eureka + instance: + instanceId: ${spring.application.name}:${spring.application.instance_id:${random.value}} + +info: + application: + name: ${spring.application.name} + version: '@project.version@' + spring-cloud-version: '@spring-cloud.version@' + spring-boot-version: '@project.parent.version@' + +management: + endpoint: + health: + probes: + enabled: true + +server: + port: ${PORT:8080} + shutdown: graceful + error: + include-message: on_param + include-stacktrace: on_param + +sentry: + dsn: https://354321d371291036cffcdb5b1a72fd6e@o394865.ingest.us.sentry.io/4507718826262528 + environment: edge-service + + # Set traces_sample_rate to 1.0 to capture 100% + # of transactions for tracing. + # We recommend adjusting this value in production. + tracesSampleRate: 1.0 diff --git a/src/main/resources/sentry-debug-meta.properties b/src/main/resources/sentry-debug-meta.properties new file mode 100644 index 0000000..f787504 --- /dev/null +++ b/src/main/resources/sentry-debug-meta.properties @@ -0,0 +1 @@ +584830D0-AEAE-453F-92F7-0E52346A3674