Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade/versions #158

Merged
merged 4 commits into from
May 23, 2024
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
18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,24 @@ responses. Errors are carefully categorized and presented with corresponding HTT
and clear error messages. It
uses [RFC 9457](https://datatracker.ietf.org/doc/html/rfc9457#name-members-of-a-problem-detail).

example:

```json
{
"type": "about:blank",
"title": "Bad Request",
"status": 400,
"detail": "Validation failed.",
"instance": "/management/companies",
"errors": [
{
"pointer": "slug",
"reason": "must not be blank"
}
]
}
```

### CI/CD - Gitflow

<div align="center">
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ services:

api-database:
container_name: api-database
image: bitnami/postgresql:16.2.0-debian-12-r8
image: bitnami/postgresql:16.3.0
network_mode: host
environment:
POSTGRESQL_DATABASE: api
Expand All @@ -61,7 +61,7 @@ services:

rabbitmq:
container_name: api-rabbitmq
image: bitnami/rabbitmq:3.12.13-debian-12-r2
image: bitnami/rabbitmq:3.13.2
network_mode: host
healthcheck:
test: rabbitmq-diagnostics -q ping
Expand All @@ -80,7 +80,7 @@ services:

keycloak:
container_name: keycloak
image: bitnami/keycloak:23.0.7-debian-12-r1
image: bitnami/keycloak:24.0.4
# network_mode: host
environment:
KEYCLOAK_ADMIN_USER: admin
Expand All @@ -97,7 +97,7 @@ services:

keycloak-database:
container_name: keycloak-database
image: bitnami/postgresql:16.2.0-debian-12-r8
image: bitnami/postgresql:16.3.0
environment:
POSTGRESQL_DATABASE: keycloak
POSTGRESQL_USERNAME: user
Expand Down
2 changes: 2 additions & 0 deletions opentelemetry/default.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/autoconfigure/README.md
# https://opentelemetry.io/docs/languages/java/automatic/configuration/

# Version 2.4.0

otel.javaagent.enabled=true
otel.javaagent.logging=application

Expand Down
2 changes: 2 additions & 0 deletions opentelemetry/dev.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/autoconfigure/README.md
# https://opentelemetry.io/docs/languages/java/automatic/configuration/

# Version 2.4.0

otel.javaagent.enabled=true
otel.javaagent.logging=application

Expand Down
Binary file modified opentelemetry/opentelemetry-javaagent.jar
Binary file not shown.
17 changes: 12 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.4</version>
<version>3.3.0</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand All @@ -24,7 +24,7 @@
<!-- Database -->
<postgresql.version>42.7.3</postgresql.version>
<querydsl.version>5.1.0</querydsl.version>
<flyway-core.version>10.8.1</flyway-core.version>
<flyway-database-postgresql.version>10.13.0</flyway-database-postgresql.version>
<hypersistence-utils.version>3.7.5</hypersistence-utils.version>

<!-- Logging -->
Expand All @@ -40,8 +40,8 @@
<lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>

<!-- utilities -->
<spring-cloud.version>2023.0.0</spring-cloud.version>
<bucket4j-core.version>8.4.0</bucket4j-core.version>
<spring-cloud.version>2023.0.1</spring-cloud.version>
<bucket4j-core.version>8.10.1</bucket4j-core.version>
<slack-api-client.version>1.39.2</slack-api-client.version>
<apache-commons-text.version>1.12.0</apache-commons-text.version>
<apache-commons-collection.version>4.4</apache-commons-collection.version>
Expand Down Expand Up @@ -96,7 +96,8 @@

<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
<artifactId>flyway-database-postgresql</artifactId>
<version>${flyway-database-postgresql.version}</version>
</dependency>
<dependency>
<groupId>io.hypersistence</groupId>
Expand Down Expand Up @@ -192,6 +193,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-kubernetes-client</artifactId>
<!-- rate limiting -->
</dependency>
<dependency>
<groupId>com.bucket4j</groupId>
<artifactId>bucket4j-core</artifactId>
<version>${bucket4j-core.version}</version>
</dependency>

<!-- Utilities-->
Expand Down
12 changes: 9 additions & 3 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,24 @@ spring:
name: api
main:
keep-alive: true # ensures JVM is kept alive, even if all threads are virtual threads https://docs.spring.io/spring-boot/docs/3.2.0-RC2/reference/htmlsingle/#features.spring-application.virtual-threads
web:
resources:
add-mappings: false # disable static content.
mvc:
log-resolved-exception: false # remove tomcat log exception since it is already treated in GlobalExceptionHandler
reactor:
context-propagation: auto # automatically propagates trace and span in reactive pipelines.
threads:
virtual:
enabled: true
web:
resources:
add-mappings: false # disable static content.
security:
oauth2:
resourceserver:
jwt:
# can not be used for now as claim name does not allow nested values.
# authorities-claim-name:
# authority-prefix: ROLE_
# principal-claim-name: email
issuer-uri: ${SECURITY_OAUTH_ISSUER_URI}
jwk-set-uri: ${SECURITY_OAUTH_JWK_SET_URI}
data:
Expand Down
Loading