Skip to content

Commit 5d8cd82

Browse files
committed
BREAKING CHANGE: upgrade to jdk17, junit5, spring6, springboot3
JIRA:GRIF-315
1 parent d1c3d5e commit 5d8cd82

23 files changed

+1059
-160
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@v4
1616
- uses: actions/setup-java@v4
1717
with:
18-
java-version: '11'
18+
java-version: '17'
1919
distribution: 'adopt'
2020
- uses: actions/cache@v4
2121
with:

.sonar.settings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Settings for sonar scan
2-
gdc.java_version=openjdk-11
2+
gdc.java_version=openjdk-17

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ Since *GoodData Java SDK* version *2.32.0* API versioning is supported. The API
6767
The *GoodData Java SDK* uses:
6868
* the [GoodData HTTP client](https://github.com/gooddata/gooddata-http-client) version 0.9.3 or later
6969
* the *Apache HTTP Client* version 4.5 or later (for white-labeled domains at least version 4.3.2 is required)
70-
* the *Spring Framework* version 5* (can be used with spring 4.3.* as well)
70+
* the *Spring Framework* version 6.x (compatible with Spring Boot 3.x)
7171
* the *Jackson JSON Processor* version 2.*
72-
* the *Slf4j API* version 1.7.*
73-
* the *Java Development Kit (JDK)* version 11 or later to build, can run on 8 and later
72+
* the *Slf4j API* version 2.0.*
73+
* the *Java Development Kit (JDK)* version 17 or later
7474

7575
##### Retry of failed API calls
7676

gooddata-java-model/pom.xml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<artifactId>gooddata-java-parent</artifactId>
99
<groupId>com.gooddata</groupId>
10-
<version>3.12.1+api3-SNAPSHOT</version>
10+
<version>4.0.0+api3-SNAPSHOT</version>
1111
</parent>
1212

1313
<dependencies>
@@ -42,6 +42,11 @@
4242
<artifactId>mockito-core</artifactId>
4343
<scope>test</scope>
4444
</dependency>
45+
<dependency>
46+
<groupId>org.mockito</groupId>
47+
<artifactId>mockito-junit-jupiter</artifactId>
48+
<scope>test</scope>
49+
</dependency>
4550
<dependency>
4651
<groupId>org.hamcrest</groupId>
4752
<artifactId>hamcrest</artifactId>
@@ -78,7 +83,7 @@
7883
<scope>test</scope>
7984
</dependency>
8085
<dependency>
81-
<groupId>org.codehaus.groovy</groupId>
86+
<groupId>org.apache.groovy</groupId>
8287
<artifactId>groovy</artifactId>
8388
<scope>test</scope>
8489
</dependency>
@@ -92,6 +97,11 @@
9297
<artifactId>spring-web</artifactId>
9398
<scope>test</scope>
9499
</dependency>
100+
<dependency>
101+
<groupId>org.junit.jupiter</groupId>
102+
<artifactId>junit-jupiter-api</artifactId>
103+
<scope>test</scope>
104+
</dependency>
95105
</dependencies>
96106

97107
<build>
@@ -100,6 +110,18 @@
100110
<groupId>org.codehaus.gmavenplus</groupId>
101111
<artifactId>gmavenplus-plugin</artifactId>
102112
</plugin>
113+
<plugin>
114+
<groupId>org.apache.maven.plugins</groupId>
115+
<artifactId>maven-dependency-plugin</artifactId>
116+
<configuration>
117+
<failOnWarning>false</failOnWarning>
118+
<ignoredUnusedDeclaredDependencies>
119+
<ignoredUnusedDeclaredDependency>com.fasterxml.jackson.core:jackson-core</ignoredUnusedDeclaredDependency>
120+
<ignoredUnusedDeclaredDependency>org.apache.commons:commons-lang3</ignoredUnusedDeclaredDependency>
121+
<ignoredUnusedDeclaredDependency>com.gooddata:gooddata-rest-common</ignoredUnusedDeclaredDependency>
122+
</ignoredUnusedDeclaredDependencies>
123+
</configuration>
124+
</plugin>
103125
</plugins>
104126
</build>
105127

gooddata-java/pom.xml

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<artifactId>gooddata-java-parent</artifactId>
99
<groupId>com.gooddata</groupId>
10-
<version>3.12.1+api3-SNAPSHOT</version>
10+
<version>4.0.0+api3-SNAPSHOT</version>
1111
</parent>
1212

1313
<dependencies>
@@ -25,6 +25,7 @@
2525
<groupId>com.gooddata</groupId>
2626
<artifactId>gooddata-http-client</artifactId>
2727
</dependency>
28+
<!-- HttpClient 4.x for backward compatibility -->
2829
<dependency>
2930
<groupId>org.apache.httpcomponents</groupId>
3031
<artifactId>httpclient</artifactId>
@@ -53,6 +54,7 @@
5354
<groupId>org.springframework</groupId>
5455
<artifactId>spring-aop</artifactId>
5556
</exclusion>
57+
<!-- Keep Spring AOP exclusions -->
5658
</exclusions>
5759
</dependency>
5860
<dependency>
@@ -64,7 +66,6 @@
6466
<dependency>
6567
<groupId>org.springframework.retry</groupId>
6668
<artifactId>spring-retry</artifactId>
67-
<version>1.3.4</version>
6869
<optional>true</optional>
6970
</dependency>
7071
<dependency>
@@ -89,11 +90,27 @@
8990
<artifactId>testng</artifactId>
9091
<scope>test</scope>
9192
</dependency>
93+
<dependency>
94+
<groupId>junit</groupId>
95+
<artifactId>junit</artifactId>
96+
<version>4.13.2</version>
97+
<scope>test</scope>
98+
</dependency>
99+
<dependency>
100+
<groupId>jakarta.servlet</groupId>
101+
<artifactId>jakarta.servlet-api</artifactId>
102+
<scope>test</scope>
103+
</dependency>
92104
<dependency>
93105
<groupId>org.mockito</groupId>
94106
<artifactId>mockito-core</artifactId>
95107
<scope>test</scope>
96108
</dependency>
109+
<dependency>
110+
<groupId>org.mockito</groupId>
111+
<artifactId>mockito-junit-jupiter</artifactId>
112+
<scope>test</scope>
113+
</dependency>
97114
<dependency>
98115
<groupId>org.hamcrest</groupId>
99116
<artifactId>hamcrest</artifactId>
@@ -145,7 +162,7 @@
145162
<scope>test</scope>
146163
</dependency>
147164
<dependency>
148-
<groupId>org.codehaus.groovy</groupId>
165+
<groupId>org.apache.groovy</groupId>
149166
<artifactId>groovy</artifactId>
150167
<scope>test</scope>
151168
</dependency>
@@ -162,6 +179,14 @@
162179
<groupId>org.codehaus.gmavenplus</groupId>
163180
<artifactId>gmavenplus-plugin</artifactId>
164181
</plugin>
182+
<plugin>
183+
<groupId>org.apache.maven.plugins</groupId>
184+
<artifactId>maven-dependency-plugin</artifactId>
185+
<version>3.6.0</version>
186+
<configuration>
187+
<failOnWarning>false</failOnWarning>
188+
</configuration>
189+
</plugin>
165190
</plugins>
166191
</build>
167192

0 commit comments

Comments
 (0)