Skip to content

Commit 1014488

Browse files
committed
feat: upgrade to Java 17, Spring Boot 3, Gradle 8
BREAKING CHANGE: reliance on Java17 is backwards incompatible. Increase this project's major version.
1 parent 00f98cb commit 1014488

File tree

8 files changed

+44
-21
lines changed

8 files changed

+44
-21
lines changed

README.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,17 @@ TestProcesses enables managing one or more of these "test processes" for your te
5555

5656
## Requirements
5757

58-
- Java 11 or above
58+
In order to use TestProcesses, currently you must be using:
59+
5960
- JUnit Jupiter
60-
- You must be using Spring Test (ideally `spring-boot-starter-test`)
61+
- Spring Test (ideally `spring-boot-starter-test`)
62+
63+
The following table describes the version compatibilities:
64+
65+
| TestProcesses Version | Min. Java Version | Spring Boot Version |
66+
|-----------------------|-------------------|---------------------|
67+
| 1.x | 11 | 2.x |
68+
| 2.x | 17 | 3.x |
6169

6270

6371
## Installation

build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11

22
allprojects {
33
group = "io.github.netmikey.testprocesses"
4-
version = "1.0.2-SNAPSHOT"
4+
version = "2.0.0-SNAPSHOT"
55
}
66

77
subprojects {
88
apply plugin: 'java-library'
99

10-
sourceCompatibility = 11
10+
java {
11+
sourceCompatibility = 17
12+
}
1113

1214
ext {
13-
springBootVersion = '2.7.6' // https://search.maven.org/artifact/org.springframework.boot/spring-boot-dependencies
15+
springBootVersion = '3.2.0' // https://search.maven.org/artifact/org.springframework.boot/spring-boot-dependencies
1416
}
1517

1618
repositories {

gradle/wrapper/gradle-wrapper.jar

1.71 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-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

gradlew

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
8080
esac
8181
done
8282

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
83+
# This is normally unused
84+
# shellcheck disable=SC2034
8685
APP_BASE_NAME=${0##*/}
86+
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8787

8888
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
8989
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
143143
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144144
case $MAX_FD in #(
145145
max*)
146+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147+
# shellcheck disable=SC3045
146148
MAX_FD=$( ulimit -H -n ) ||
147149
warn "Could not query maximum file descriptor limit"
148150
esac
149151
case $MAX_FD in #(
150152
'' | soft) :;; #(
151153
*)
154+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155+
# shellcheck disable=SC3045
152156
ulimit -n "$MAX_FD" ||
153157
warn "Could not set maximum file descriptor limit to $MAX_FD"
154158
esac
@@ -205,6 +209,12 @@ set -- \
205209
org.gradle.wrapper.GradleWrapperMain \
206210
"$@"
207211

212+
# Stop when "xargs" is not available.
213+
if ! command -v xargs >/dev/null 2>&1
214+
then
215+
die "xargs is not available"
216+
fi
217+
208218
# Use "xargs" to parse quoted args.
209219
#
210220
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@rem limitations under the License.
1515
@rem
1616

17-
@if "%DEBUG%" == "" @echo off
17+
@if "%DEBUG%"=="" @echo off
1818
@rem ##########################################################################
1919
@rem
2020
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
2525
if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
28+
if "%DIRNAME%"=="" set DIRNAME=.
29+
@rem This is normally unused
2930
set APP_BASE_NAME=%~n0
3031
set APP_HOME=%DIRNAME%
3132

@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4041

4142
set JAVA_EXE=java.exe
4243
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
44+
if %ERRORLEVEL% equ 0 goto execute
4445

4546
echo.
4647
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7576

7677
:end
7778
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
79+
if %ERRORLEVEL% equ 0 goto mainEnd
7980

8081
:fail
8182
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8283
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
84+
set EXIT_CODE=%ERRORLEVEL%
85+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
86+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
87+
exit /b %EXIT_CODE%
8588

8689
:mainEnd
8790
if "%OS%"=="Windows_NT" endlocal

publishing-build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ if (!project.hasProperty("sonatypePassword")) {
1111
}
1212

1313
task javadocJar(type: Jar) {
14-
classifier = 'javadoc'
14+
archiveClassifier = 'javadoc'
1515
from javadoc
1616
}
1717

1818
task sourcesJar(type: Jar) {
19-
classifier = 'sources'
19+
archiveClassifier = 'sources'
2020
from sourceSets.main.allSource
2121
}
2222

testprocesses-core/src/main/java/io/github/netmikey/testprocesses/TestProcessesRegistry.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
import java.util.function.Function;
1919
import java.util.stream.Collectors;
2020

21-
import javax.annotation.PostConstruct;
22-
import javax.annotation.PreDestroy;
23-
2421
import org.slf4j.Logger;
2522
import org.slf4j.LoggerFactory;
2623
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +27,8 @@
3027

3128
import io.github.netmikey.testprocesses.eventdetector.EventDetector;
3229
import io.github.netmikey.testprocesses.utils.StreamStart;
30+
import jakarta.annotation.PostConstruct;
31+
import jakarta.annotation.PreDestroy;
3332

3433
/**
3534
* A registry that holds all defined processes.

0 commit comments

Comments
 (0)