Skip to content

Commit 8f2db98

Browse files
committed
chore(infra): minor updates to run the project
1 parent 3f29c8e commit 8f2db98

File tree

10 files changed

+44
-33
lines changed

10 files changed

+44
-33
lines changed

.github/workflows/docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
test:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v6
1818

1919
- name: Run tests
2020
run: |
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
if: github.event_name == 'push'
3232
steps:
33-
- uses: actions/checkout@v3
33+
- uses: actions/checkout@v6
3434

3535
- name: Build image
3636
run: docker build . --file Dockerfile --tag $IMAGE_NAME

.github/workflows/maven.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313

1414
steps:
1515
- name: Checkout project
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v6
1717

18-
- name: Configure Azul Zulu OpenJDK 21
19-
uses: actions/setup-java@v2
18+
- name: Configure Azul Zulu OpenJDK 25
19+
uses: actions/setup-java@v5
2020
with:
21-
java-version: "21"
21+
java-version: "25"
2222
distribution: "zulu"
2323

2424
- name: Maven build

.github/workflows/vulnerability_scan.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@ jobs:
2222

2323
steps:
2424
- name: Checkout repository
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v6
2626

27-
- name: Configure Configure Azul Zulu OpenJDK 21
28-
uses: actions/setup-java@v2
27+
- name: Configure Configure Azul Zulu OpenJDK 25
28+
uses: actions/setup-java@v5
2929
with:
30-
java-version: "21"
30+
java-version: "25"
3131
distribution: "zulu"
3232

3333
- name: Initialize CodeQL
34-
uses: github/codeql-action/init@v2
34+
uses: github/codeql-action/init@v4
3535
with:
3636
languages: ${{ matrix.language }}
3737

3838
- name: Autobuild
39-
uses: github/codeql-action/autobuild@v2
39+
uses: github/codeql-action/autobuild@v4
4040

4141
- name: Perform CodeQL Analysis
42-
uses: github/codeql-action/analyze@v2
42+
uses: github/codeql-action/analyze@v4
4343
with:
4444
category: "/language:${{matrix.language}}"

.otel/otel.jar

23 MB
Binary file not shown.

Makefile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: clean install test version up down restart upgrade_otel_agent
1+
.PHONY: clean install test version up down restart otel-agent
22

33
clean:
44
@mvn clean
@@ -25,8 +25,10 @@ down:
2525
restart:
2626
@docker-compose restart
2727

28-
upgrade_otel_agent:
29-
@echo "Download the OTEL Java Agent..."
30-
@mkdir -p agents
31-
@curl -o agents/opentelemetry-javaagent.jar -L https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.33.3/opentelemetry-javaagent.jar
32-
@rm -rf agents/version.txt
28+
otel-agent:
29+
@echo "Update local version for OTEL Java Agent..."
30+
@mkdir -p .otel
31+
@curl -o .otel/otel.jar -L https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar
32+
@curl --progress-bar -sL https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases | grep -oE 'releases/tag/v[0-9]+\.[0-9]+\.[0-9]+' | cut -d'/' -f3 | sort -V | tail -n 1 > .otel/version.txt
33+
@VERSION=$$(cat .otel/version.txt) && echo "OTEL Java Agent local was updated to $$VERSION"
34+
@rm -rf .otel/version.txt

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Esta arquitetura consiste em diminuir a concorrência entre transações da API
1616
</br>
1717
</br>
1818

19-
[![node](https://img.shields.io/badge/Azul_Zulu_OpenJDK-21-red.svg)](https://www.azul.com/downloads/?package=jdk#zulu)
20-
[![node](https://img.shields.io/badge/Spring_Boot-3.4.0-green.svg)](https://spring.io/)
19+
[![node](https://img.shields.io/badge/Azul_Zulu_OpenJDK-25-red.svg)](https://www.azul.com/downloads/?package=jdk#zulu)
20+
[![node](https://img.shields.io/badge/Spring_Boot-3.5.10-green.svg)](https://spring.io/)
2121
[![node](https://img.shields.io/badge/MySQL-8.0.28-blue.svg)](https://www.mysql.com/)
2222

2323

docker-compose.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
version: "3.9"
2-
31
services:
42

53
master-db:
6-
image: docker.io/bitnami/mysql:8.0
4+
image: docker.io/bitnamilegacy/mysql:8.0
75
container_name: master-db
86
restart: "no"
97
ports:
@@ -26,7 +24,7 @@ services:
2624
retries: 6
2725

2826
replica-db:
29-
image: docker.io/bitnami/mysql:8.0
27+
image: docker.io/bitnamilegacy/mysql:8.0
3028
container_name: replica-db
3129
restart: "no"
3230
ports:

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.4.0</version>
8+
<version>3.5.10</version>
99
<relativePath/>
1010
</parent>
1111

@@ -15,13 +15,13 @@
1515
<name>multidatasources</name>
1616

1717
<properties>
18-
<java.version>21</java.version>
18+
<java.version>25</java.version>
1919
<maven.compiler.source>${java.version}</maven.compiler.source>
2020
<maven.compiler.target>${java.version}</maven.compiler.target>
21-
<mapstruct.version>1.5.5.Final</mapstruct.version>
22-
<logstash-logback-encoder.version>7.4</logstash-logback-encoder.version>
23-
<springdoc-openapi-starter-webmvc-ui.version>2.5.0</springdoc-openapi-starter-webmvc-ui.version>
24-
<opentelemetry.version>1.38.0</opentelemetry.version>
21+
<mapstruct.version>1.6.3</mapstruct.version>
22+
<logstash-logback-encoder.version>9.0</logstash-logback-encoder.version>
23+
<springdoc-openapi-starter-webmvc-ui.version>2.8.15</springdoc-openapi-starter-webmvc-ui.version>
24+
<opentelemetry.version>1.58.0</opentelemetry.version>
2525
</properties>
2626

2727
<dependencyManagement>

src/main/resources/application.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ spring:
4343
add-mappings: false
4444
mvc:
4545
throw-exception-if-no-handler-found: true
46+
jmx:
47+
enabled: false
4648
metrics:
4749
web:
4850
server:
@@ -78,6 +80,7 @@ logging:
7880
level:
7981
ROOT: INFO
8082
br.com.multidatasources: INFO
83+
sun.rmi.transport.tcp: ERROR
8184
appender: CONSOLE
8285
pattern:
8386
console: "%d{yyyy-MM-dd HH:mm:ss.SSS} %X{X-Request-ID} %highlight(%-5level) %magenta([%t]) %obfuscate(%msg)%n"

src/test/resources/application-integration-test.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DATABASE SCHEMA PROPERTIES
22
schema:
3-
name: master-db
3+
name: PUBLIC
44
user: sa
55
pass: sa
66

@@ -12,7 +12,7 @@ spring:
1212
jpa:
1313
show-sql: true
1414
hibernate:
15-
ddl-auto: create-drop
15+
ddl-auto: none
1616
properties:
1717
"[hibernate.format_sql]": true
1818

@@ -31,3 +31,11 @@ replica:
3131
url: jdbc:h2:mem:${schema.name};MODE=MYSQL;DATABASE_TO_LOWER=TRUE;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1
3232
username: ${schema.user}
3333
password: ${schema.pass}
34+
35+
# FLYWAY PROPERTIES
36+
flyway:
37+
schema-name: ${schema.name}
38+
baseline-on-migrate: true
39+
locations:
40+
- classpath:db/migration
41+
- classpath:db/test-data

0 commit comments

Comments
 (0)