Skip to content

Commit 654df58

Browse files
committed
Upgrade to Java17/Spring boot 3.4/gradle 8.10
1 parent 5dcb37e commit 654df58

File tree

8 files changed

+227
-140
lines changed

8 files changed

+227
-140
lines changed

build.gradle

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,27 @@
1+
2+
buildscript {
3+
repositories {
4+
mavenCentral()
5+
}
6+
dependencies {
7+
classpath 'org.owasp:dependency-check-gradle:9.0.9'
8+
}
9+
}
10+
11+
112
plugins {
2-
id 'org.springframework.boot' version '2.7.18'
3-
id 'io.spring.dependency-management' version '1.1.4'
13+
id 'org.springframework.boot' version '3.4.6'
14+
id 'io.spring.dependency-management' version '1.1.7'
415
id 'java-library'
516
id 'war'
617
id 'maven-publish'
718
}
19+
apply plugin: 'org.owasp.dependencycheck'
20+
821

922
import org.gradle.internal.jvm.Jvm
1023

11-
assert Jvm.current().javaVersion >= JavaVersion.VERSION_11: 'This project requires Java 11+'
24+
assert Jvm.current().javaVersion >= JavaVersion.VERSION_17: 'This project requires Java 17+'
1225

1326
group = 'ARIN'
1427
description = 'RDAP Bootstrap Server'
@@ -18,25 +31,24 @@ if (project.hasProperty('artifactVersion')) {
1831
version = "${project.properties.artifactVersion}"
1932
}
2033

21-
sourceCompatibility = JavaVersion.VERSION_11
22-
targetCompatibility = JavaVersion.VERSION_11
34+
sourceCompatibility = JavaVersion.VERSION_17
35+
targetCompatibility = JavaVersion.VERSION_17
2336

2437
repositories {
2538
maven { url 'https://repo.maven.apache.org/maven2' }
2639
}
2740

28-
ext['logback.version'] = '1.2.13' //Have spring use a logback version without CVEs
29-
3041
dependencies {
3142
implementation 'org.springframework.boot:spring-boot-starter-web'
3243
implementation 'org.springframework.boot:spring-boot-starter-actuator'
3344
implementation group: 'com.googlecode.java-ipv6', name: 'java-ipv6', version: '0.17'
34-
implementation group: 'net.ripe.ipresource', name: 'ipresource', version: '1.47'
35-
implementation group: 'commons-io', name: 'commons-io', version: '2.7'
45+
implementation group: 'net.ripe.ipresource', name: 'ipresource', version: '1.52'
46+
implementation group: 'commons-io', name: 'commons-io', version: '2.18.0'
3647

3748
providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
3849

3950
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
51+
testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.14.2'
4052
}
4153

4254
bootJar {

gradle/wrapper/gradle-wrapper.jar

2.36 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)