Skip to content

Commit 2b26ac4

Browse files
committed
JIRA:GRIF-315 ver 3
1 parent 9bcc75e commit 2b26ac4

File tree

204 files changed

+2287
-4191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+2287
-4191
lines changed

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: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,8 @@
3333
</dependency>
3434

3535
<dependency>
36-
<groupId>org.junit.jupiter</groupId>
37-
<artifactId>junit-jupiter</artifactId>
38-
<scope>test</scope>
39-
</dependency>
40-
<dependency>
41-
<groupId>org.junit.jupiter</groupId>
42-
<artifactId>junit-jupiter-params</artifactId>
36+
<groupId>org.testng</groupId>
37+
<artifactId>testng</artifactId>
4338
<scope>test</scope>
4439
</dependency>
4540
<dependency>
@@ -115,6 +110,18 @@
115110
<groupId>org.codehaus.gmavenplus</groupId>
116111
<artifactId>gmavenplus-plugin</artifactId>
117112
</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>
118125
</plugins>
119126
</build>
120127

gooddata-java-model/src/test/groovy/com/gooddata/sdk/model/executeafm/result/ExecutionResultTest.groovy

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,7 @@ class ExecutionResultTest extends Specification {
8787
def warnings = result.warnings
8888
warnings == [new Warning('gdc123', 'Some msg %s %s %s', ['bum', 1, null])]
8989

90-
// Test basic properties instead of toString() to avoid Java 17 module restrictions
91-
result.data != null
92-
result.paging != null
93-
result.headerItems != null
90+
result.toString()
9491
}
9592

9693
def "should set properties"() {

gooddata-java-model/src/test/java/com/gooddata/sdk/model/account/AccountTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
package com.gooddata.sdk.model.account;
77

8-
import org.junit.jupiter.api.Test;
8+
import org.testng.annotations.Test;
99

1010
import static com.gooddata.sdk.model.account.Account.AuthenticationMode.SSO;
1111
import static net.javacrumbs.jsonunit.JsonMatchers.jsonEquals;

gooddata-java-model/src/test/java/com/gooddata/sdk/model/account/AccountsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package com.gooddata.sdk.model.account;
77

88
import org.hamcrest.Matchers;
9-
import org.junit.jupiter.api.Test;
9+
import org.testng.annotations.Test;
1010

1111
import static com.gooddata.sdk.common.util.ResourceUtils.readObjectFromResource;
1212
import static org.hamcrest.CoreMatchers.is;

gooddata-java-model/src/test/java/com/gooddata/sdk/model/auditevent/AccessLogTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
package com.gooddata.sdk.model.auditevent;
77

8-
import org.junit.jupiter.api.Test;
8+
import org.testng.annotations.Test;
99

1010
import java.time.LocalDate;
1111
import java.time.ZonedDateTime;

gooddata-java-model/src/test/java/com/gooddata/sdk/model/auditevent/AccessLogsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import com.gooddata.sdk.common.collections.Paging;
99
import org.springframework.web.util.UriTemplate;
10-
import org.junit.jupiter.api.Test;
10+
import org.testng.annotations.Test;
1111

1212
import java.time.LocalDate;
1313
import java.time.ZonedDateTime;

gooddata-java-model/src/test/java/com/gooddata/sdk/model/auditevent/AuditEventTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
package com.gooddata.sdk.model.auditevent;
77

8-
import org.junit.jupiter.api.Test;
8+
import org.testng.annotations.Test;
99

1010
import java.time.LocalDate;
1111
import java.time.ZonedDateTime;

gooddata-java-model/src/test/java/com/gooddata/sdk/model/auditevent/AuditEventsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import com.gooddata.sdk.common.collections.Paging;
99
import org.springframework.web.util.UriTemplate;
10-
import org.junit.jupiter.api.Test;
10+
import org.testng.annotations.Test;
1111

1212
import java.time.LocalDate;
1313
import java.time.ZonedDateTime;

gooddata-java-model/src/test/java/com/gooddata/sdk/model/connector/IntegrationProcessStatusTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
package com.gooddata.sdk.model.connector;
77

8-
import org.junit.jupiter.api.Test;
8+
import org.testng.annotations.Test;
99

1010
import java.time.LocalDateTime;
1111
import java.util.Collections;

0 commit comments

Comments
 (0)