Skip to content

Commit 2f4bc34

Browse files
Merge pull request #30 from eliasnogueira/java24
Java 24 adoption
2 parents d0a9606 + 33f59e4 commit 2f4bc34

File tree

4 files changed

+30
-8
lines changed

4 files changed

+30
-8
lines changed

.github/workflows/test-execution.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
- 8088:8088
2424
steps:
2525
- uses: actions/checkout@v4
26-
- name: Set up JDK 23
26+
- name: Set up JDK 24
2727
uses: actions/setup-java@v4
2828
with:
29-
java-version: 23
30-
distribution: oracle
29+
java-version: 24
30+
distribution: temurin
3131

3232
- name: Cache Maven packages
3333
uses: actions/cache@v4

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [2.5.0] - 21-03-2024
9+
10+
### Changed
11+
12+
- Adoption of Java 24
13+
- Updated the following dependencies
14+
- `restassured -> 5.5.1`
15+
- `aspectj -> 1.9.23`
16+
817
## [2.4.4] - 17-12-2024
918

1019
### Changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ It tests the API: [combined-credit-api](https://github.com/eliasnogueira/combine
2727
> but the central point of this repository and demonstrate an example of running tests for API in a pipeline
2828
2929
## Required software
30-
* Java JDK 23+
30+
* Java JDK 24+
3131
* Maven installed and in your classpath
3232
* Clone/download the backend API [combined-credit-api](https://github.com/eliasnogueira/combined-credit-api)
3333

pom.xml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66

77
<groupId>com.eliasogueira.credit</groupId>
88
<artifactId>restassured-complete-basic-example</artifactId>
9-
<version>2.4.4</version>
9+
<version>2.5.0</version>
1010

1111
<properties>
12-
<java.version>23</java.version>
12+
<java.version>24</java.version>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1515
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
1616
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
1717
<maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
1818

19-
<restassured.version>5.5.0</restassured.version>
19+
<restassured.version>5.5.1</restassured.version>
2020
<junit.jupiter.version>5.11.4</junit.jupiter.version>
2121
<assertj.version>3.26.3</assertj.version>
2222
<datafaker.version>2.4.2</datafaker.version>
@@ -25,10 +25,13 @@
2525
<slf4j.version>2.0.13</slf4j.version>
2626
<allure.version>2.29.1</allure.version>
2727
<allure-maven.version>2.15.2</allure-maven.version>
28-
<aspectj.version>1.9.22.1</aspectj.version>
28+
<aspectj.version>1.9.23</aspectj.version>
2929
<allure.cmd.download.url>
3030
https://repo.maven.apache.org/maven2/io/qameta/allure/allure-commandline
3131
</allure.cmd.download.url>
32+
33+
<!-- override vulnerable dependencies -->
34+
<jackson-databind.version>2.18.3</jackson-databind.version>
3235
</properties>
3336

3437
<dependencies>
@@ -41,6 +44,10 @@
4144
<groupId>commons-codec</groupId>
4245
<artifactId>commons-codec</artifactId>
4346
</exclusion>
47+
<exclusion>
48+
<groupId>com.fasterxml.jackson.core</groupId>
49+
<artifactId>jackson-databind</artifactId>
50+
</exclusion>
4451
</exclusions>
4552
</dependency>
4653

@@ -123,6 +130,12 @@
123130
<version>${slf4j.version}</version>
124131
</dependency>
125132

133+
<!-- override vulnerable dependencies -->
134+
<dependency>
135+
<groupId>com.fasterxml.jackson.core</groupId>
136+
<artifactId>jackson-databind</artifactId>
137+
<version>${jackson-databind.version}</version>
138+
</dependency>
126139
</dependencies>
127140

128141
<build>

0 commit comments

Comments
 (0)