Skip to content

Commit 8874441

Browse files
authored
EPMRPP-93672 migrate to Spring Boot 3 (#63)
* EPMRPP-93672 migrate to JDK-21 * EPMRPP-93672 set JDK 21 * EPMRPP-93672 set JDK 21 * EPMRPP-93672 set JDK 21 * EPMRPP-93672 update versions * EPMRPP-93672 update versions * EPMRPP-93073 support spring boot 3 * EPMRPP-93073 support spring boot 3 * EPMRPP-93073 support spring boot 3 * EPMRPP-93073 support spring boot 3 * EPMRPP-93073 support spring boot 3
1 parent c4daa04 commit 8874441

File tree

13 files changed

+63
-40
lines changed

13 files changed

+63
-40
lines changed

.gitattributes

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#
2+
# https://help.github.com/articles/dealing-with-line-endings/
3+
#
4+
# Linux start script should use lf
5+
/gradlew text eol=lf
6+
7+
# These are Windows script files and should use crlf
8+
*.bat text eol=crlf
9+
10+
# Binary files should be left untouched
11+
*.jar binary
12+

.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,9 @@ hs_err_pid*
1515
.idea/
1616
build/
1717
.gradle/
18+
19+
# Ignore Gradle project-specific cache directory
20+
.gradle
21+
22+
# Ignore Gradle build output directory
23+
build

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
script: ./gradlew build --full-stacktrace
99

1010
jdk:
11-
- oraclejdk11
11+
- openjdk21
1212

1313
before_cache:
1414
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock

build.gradle

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'io.spring.dependency-management' version '1.1.6'
2+
id 'io.spring.dependency-management' version '1.1.7'
33
id 'java'
44
id 'java-library'
55
}
@@ -35,26 +35,28 @@ dependencyManagement {
3535
mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:5.13.0' : 'com.epam.reportportal:commons-bom:5.13.0')
3636
}
3737
}
38+
ext['spring-boot.version'] = "${springBootVersion}"
3839

3940
dependencies {
4041
if (releaseMode) {
4142
implementation 'com.epam.reportportal:commons-dao'
4243
api 'com.epam.reportportal:commons'
4344
} else {
44-
implementation 'com.github.reportportal:commons-dao:bb8ea46'
45-
api 'com.github.reportportal:commons:3dfb9d8'
45+
implementation 'com.github.reportportal:commons-dao:0f555c9'
46+
api 'com.github.reportportal:commons:c7041ee'
4647
}
47-
api 'org.pf4j:pf4j:3.10.0'
48+
49+
api 'org.pf4j:pf4j:3.12.1'
4850
api 'org.pf4j:pf4j-update:2.3.0'
4951

50-
implementation 'org.hibernate:hibernate-core:5.6.15.Final'
52+
implementation 'org.hibernate:hibernate-core:6.6.5.Final'
5153

52-
testImplementation 'junit:junit'
54+
testImplementation "org.junit.jupiter:junit-jupiter-api"
5355
}
5456

5557

5658
wrapper {
57-
gradleVersion = '8.10'
59+
gradleVersion = '8.12'
5860
}
5961

6062
tasks.preTagCommit.enabled = false

gradle.properties

+3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
version=5.13.0
22
description=EPAM Report portal. Plugin extension APIs
3+
springBootVersion=3.4.2
4+
org.gradle.parallel=true
5+
org.gradle.caching=true

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

jitpack.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
jdk:
2-
- openjdk21
2+
- openjdk21

src/main/java/com/epam/reportportal/extension/bugtracking/CommonPredicates.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.function.Predicate;
2222

2323
/**
24-
* Some common {@link org.apache.commons.collections.Predicate}
24+
* Some common {@link Predicate}
2525
*
2626
* @author Andrei Varabyeu
2727
*/
@@ -34,4 +34,4 @@ private CommonPredicates() {
3434
public static final Predicate<Collection<?>> IS_EMPTY = input -> null == input || input.isEmpty();
3535

3636
public static final Predicate<Map<?, ?>> IS_MAP_EMPTY = input -> null == input || input.isEmpty();
37-
}
37+
}

src/main/java/com/epam/reportportal/extension/common/IntegrationTypeProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.epam.ta.reportportal.entity.integration.IntegrationTypeDetails;
2020

21-
import javax.validation.constraints.NotNull;
21+
import jakarta.validation.constraints.NotNull;
2222
import java.util.HashMap;
2323
import java.util.Map;
2424
import java.util.Optional;
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
package com.epam.reportportal.extension.lookup;
22

3-
import org.springframework.stereotype.Service;
4-
53
import java.util.LinkedHashMap;
64
import java.util.Map;
5+
import org.springframework.stereotype.Service;
76

87
@Service
9-
public class ExtensionContainer {
8+
@Deprecated(forRemoval = true)
9+
public class ExtensionContainer<T> {
1010

11-
private final Map<String, Object> extensions;
11+
private final Map<String, T> extensions;
1212

1313
public ExtensionContainer() {
1414
this.extensions = new LinkedHashMap<>();
1515
}
1616

17-
public void add(String key, Object extension) {
17+
public void add(String key, T extension) {
1818
extensions.put(key, extension);
1919
}
2020

21-
public void remove(String key) {
21+
public void remove(String key) {
2222
extensions.remove(key);
2323
}
2424

25-
public <T> T get(String key) {
26-
return (T) extensions.get(key);
25+
public T get(String key) {
26+
return extensions.get(key);
2727
}
2828

2929
}

src/main/java/com/epam/reportportal/extension/util/CommandParamUtils.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import com.epam.reportportal.rules.commons.validation.Suppliers;
1919
import com.epam.reportportal.rules.exception.ReportPortalException;
2020
import com.epam.reportportal.rules.exception.ErrorType;
21-
import javax.validation.ConstraintViolation;
22-
import javax.validation.Path;
21+
import jakarta.validation.ConstraintViolation;
22+
import jakarta.validation.Path;
2323
import java.util.Iterator;
2424
import java.util.Map;
2525
import java.util.Set;

src/main/java/com/epam/reportportal/extension/util/RequestEntityValidator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import com.epam.reportportal.rules.exception.ReportPortalException;
2020
import com.epam.reportportal.rules.exception.ErrorType;
21-
import javax.validation.Validation;
22-
import javax.validation.Validator;
21+
import jakarta.validation.Validation;
22+
import jakarta.validation.Validator;
2323
import java.util.List;
2424
import java.util.stream.Collectors;
2525

src/test/java/com/epam/reportportal/extension/common/ExtensionPointTest.java

+15-15
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@
1515
*/
1616
package com.epam.reportportal.extension.common;
1717

18-
import org.hamcrest.CoreMatchers;
19-
import org.junit.Assert;
20-
import org.junit.Test;
18+
19+
import org.junit.jupiter.api.Assertions;
20+
import org.junit.jupiter.api.Test;
2121

2222
public class ExtensionPointTest {
2323

24-
@Test
25-
public void findByExtensionPositive() {
26-
Assert.assertThat("Incorrect find by extension",
27-
ExtensionPoint.findByExtension(ExtensionPoint.BTS.getExtensionClass()).isPresent(),
28-
CoreMatchers.is(true)
29-
);
30-
}
24+
@Test
25+
public void findByExtensionPositive() {
26+
Assertions.assertTrue(
27+
ExtensionPoint.findByExtension(ExtensionPoint.BTS.getExtensionClass()).isPresent(),
28+
"Incorrect find by extension");
29+
}
3130

32-
@Test
33-
public void findByExtensionNegative() {
34-
Assert.assertThat("Incorrect find by extension", ExtensionPoint.findByExtension(String.class).isPresent(), CoreMatchers.is(false));
35-
}
36-
}
31+
@Test
32+
public void findByExtensionNegative() {
33+
Assertions.assertTrue(
34+
ExtensionPoint.findByExtension(String.class).isPresent(), "Incorrect find by extension");
35+
}
36+
}

0 commit comments

Comments
 (0)