Commit 6cb743bb authored by MarkG's avatar MarkG Committed by TIGERs GitLab
Browse files

Resolve "Upgrade to JDK 17"

Closes #1712

See merge request main/Sumatra!1478

sumatra-commit: 3818311df3eaeb641e77b63b7dddd78e4f8a7adc
parent 0c9af352
Pipeline #17283 failed with stage
in 5 minutes and 41 seconds
......@@ -10,8 +10,8 @@ plugins {
id 'sumatra.version-conventions'
}
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
repositories {
maven {
......@@ -66,4 +66,4 @@ analyzeClassesDependencies {
analyzeTestClassesDependencies {
// Set to false until up-to-date check works again (bug in plugin)
logDependencyInformationToFiles = false
}
\ No newline at end of file
}
......@@ -8,7 +8,7 @@ plugins {
protobuf {
protoc {
artifact = 'com.google.protobuf:protoc:3.19.0'
artifact = 'com.google.protobuf:protoc:3.19.3'
}
// https://github.com/google/protobuf/issues/2054
generateProtoTasks {
......
......@@ -15,5 +15,5 @@ dependencies {
implementation 'com.sleepycat:je:18.3.12'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.21.0'
testImplementation 'org.assertj:assertj-core:3.22.0'
}
......@@ -17,7 +17,7 @@ dependencies {
implementation 'commons-configuration:commons-configuration:1.10'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
implementation 'com.miglayout:miglayout-swing:11.0'
implementation 'com.miglayout:miglayout-core:11.0'
......
......@@ -13,17 +13,17 @@ dependencies {
implementation 'org.apache.commons:commons-math3:3.6.1'
implementation 'commons-lang:commons-lang:2.6'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
implementation 'com.sleepycat:je:18.3.12'
api 'com.googlecode.json-simple:json-simple:1.1.1'
implementation 'net.jafama:jafama:2.3.2'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.21.0'
testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.7.2'
testImplementation 'org.assertj:assertj-core:3.22.0'
testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.8.2'
testImplementation 'com.google.guava:guava:31.0.1-jre'
testRuntimeOnly 'org.apache.logging.log4j:log4j-core:2.14.1'
testRuntimeOnly 'org.apache.logging.log4j:log4j-core:2.17.1'
}
......@@ -16,9 +16,9 @@ dependencies {
implementation 'commons-lang:commons-lang:2.6'
implementation 'org.apache.commons:commons-math3:3.6.1'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-core:2.14.1'
annotationProcessor 'org.apache.logging.log4j:log4j-core:2.14.1'
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
implementation 'org.apache.logging.log4j:log4j-core:2.17.1'
annotationProcessor 'org.apache.logging.log4j:log4j-core:2.17.1'
implementation 'com.sleepycat:je:18.3.12'
implementation 'gov.nist.math:jama:1.0.3'
......@@ -26,10 +26,10 @@ dependencies {
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.21.0'
testImplementation 'org.assertj:assertj-core:3.22.0'
testImplementation 'org.openjdk.jmh:jmh-core:1.33'
testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.33'
testImplementation 'org.openjdk.jmh:jmh-core:1.34'
testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.34'
}
task runBangBangTrajectoryBenchmark(type: JavaExec) {
......
......@@ -29,7 +29,7 @@ dependencies {
implementation 'com.github.g3force:configurable:3.0'
api 'com.github.g3force:instanceables:5.2'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
implementation 'commons-configuration:commons-configuration:1.10'
implementation 'com.google.guava:guava:31.0.1-jre'
......@@ -37,8 +37,8 @@ dependencies {
implementation 'commons-lang:commons-lang:2.6'
implementation 'com.sleepycat:je:18.3.12'
implementation 'com.google.protobuf:protobuf-java:3.19.0'
implementation 'com.google.protobuf:protobuf-java:3.19.3'
integrationTestImplementation project(':common')
integrationTestImplementation project(':sumatra-model')
......@@ -49,16 +49,16 @@ dependencies {
integrationTestImplementation project(':moduli-record')
integrationTestImplementation 'junit:junit:4.13.2'
integrationTestImplementation 'org.assertj:assertj-core:3.21.0'
integrationTestImplementation 'com.google.protobuf:protobuf-java:3.19.0'
integrationTestImplementation 'com.google.protobuf:protobuf-java-util:3.19.0'
integrationTestImplementation 'org.assertj:assertj-core:3.22.0'
integrationTestImplementation 'com.google.protobuf:protobuf-java:3.19.3'
integrationTestImplementation 'com.google.protobuf:protobuf-java-util:3.19.3'
integrationTestImplementation 'com.github.g3force:configurable:3.0'
integrationTestImplementation 'org.apache.logging.log4j:log4j-api:2.14.1'
integrationTestRuntimeOnly 'org.apache.logging.log4j:log4j-core:2.14.1'
integrationTestRuntimeOnly 'org.apache.logging.log4j:log4j-1.2-api:2.14.1'
integrationTestRuntimeOnly 'org.slf4j:slf4j-log4j12:1.7.32'
integrationTestImplementation 'org.apache.logging.log4j:log4j-api:2.17.1'
integrationTestRuntimeOnly 'org.apache.logging.log4j:log4j-core:2.17.1'
integrationTestRuntimeOnly 'org.apache.logging.log4j:log4j-1.2-api:2.17.1'
integrationTestRuntimeOnly 'org.slf4j:slf4j-log4j12:1.7.33'
integrationTestAnnotationProcessor "org.projectlombok:lombok:1.18.22"
integrationTestImplementation "org.projectlombok:lombok:1.18.22"
......
......@@ -16,7 +16,7 @@ dependencies {
implementation 'com.github.TIGERs-Mannheim:moduli:4.1'
implementation 'com.github.g3force:configurable:3.0'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
implementation 'commons-configuration:commons-configuration:1.10'
}
......@@ -15,13 +15,13 @@ dependencies {
implementation 'com.github.TIGERs-Mannheim:moduli:4.1'
implementation 'com.github.g3force:configurable:3.0'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
implementation 'commons-configuration:commons-configuration:1.10'
implementation 'org.apache.commons:commons-collections4:4.4'
implementation 'org.apache.commons:commons-math3:3.6.1'
api 'com.google.protobuf:protobuf-java:3.19.0'
api 'com.google.protobuf:protobuf-java:3.19.3'
implementation 'com.sleepycat:je:18.3.12'
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
......
......@@ -16,13 +16,13 @@ dependencies {
implementation 'com.github.TIGERs-Mannheim:moduli:4.1'
implementation 'com.github.g3force:configurable:3.0'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
implementation 'commons-lang:commons-lang:2.6'
implementation 'com.google.protobuf:protobuf-java:3.19.0'
implementation 'com.google.protobuf:protobuf-java:3.19.3'
implementation 'com.sleepycat:je:18.3.12'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.21.0'
testImplementation 'org.assertj:assertj-core:3.22.0'
}
......@@ -15,12 +15,12 @@ dependencies {
implementation 'com.github.TIGERs-Mannheim:moduli:4.1'
implementation 'com.github.g3force:configurable:3.0'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-core:2.14.1'
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
implementation 'org.apache.logging.log4j:log4j-core:2.17.1'
implementation 'commons-io:commons-io:2.11.0'
implementation 'commons-lang:commons-lang:2.6'
implementation 'net.lingala.zip4j:zip4j:2.9.0'
implementation 'net.lingala.zip4j:zip4j:2.9.1'
implementation 'com.sleepycat:je:18.3.12'
}
......@@ -30,17 +30,17 @@ dependencies {
implementation 'com.github.g3force:configurable:3.0'
implementation 'com.github.g3force:instanceables:5.2'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
implementation 'commons-lang:commons-lang:2.6'
implementation 'commons-configuration:commons-configuration:1.10'
implementation 'commons-io:commons-io:2.11.0'
api 'com.google.protobuf:protobuf-java:3.19.0'
api 'com.google.protobuf:protobuf-java:3.19.3'
implementation 'com.sleepycat:je:18.3.12'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.21.0'
testImplementation 'org.assertj:assertj-core:3.22.0'
runtimeOnly "com.github.TIGERs-Mannheim:ssl-game-controller-maven:2.13.0.1:${osClassifier}"
}
......@@ -23,7 +23,7 @@ dependencies {
implementation 'org.apache.commons:commons-collections4:4.4'
implementation 'commons-configuration:commons-configuration:1.10'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
implementation 'com.sleepycat:je:18.3.12'
}
......@@ -26,13 +26,13 @@ dependencies {
implementation 'commons-lang:commons-lang:2.6'
implementation 'commons-configuration:commons-configuration:1.10'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
implementation 'com.sleepycat:je:18.3.12'
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
api 'com.google.protobuf:protobuf-java:3.19.0'
api 'com.google.protobuf:protobuf-java:3.19.3'
implementation 'commons-codec:commons-codec:1.15'
testImplementation 'org.assertj:assertj-core:3.21.0'
testImplementation 'org.assertj:assertj-core:3.22.0'
testImplementation 'junit:junit:4.13.2'
}
......@@ -15,8 +15,8 @@ dependencies {
implementation 'com.github.TIGERs-Mannheim:moduli:4.1'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
api 'com.google.protobuf:protobuf-java:3.19.0'
api 'com.google.protobuf:protobuf-java:3.19.3'
implementation 'com.google.guava:guava:31.0.1-jre'
}
......@@ -12,8 +12,8 @@ dependencies {
implementation project(':common-gui')
implementation project(':sumatra-model')
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-core:2.14.1'
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
implementation 'org.apache.logging.log4j:log4j-core:2.17.1'
implementation 'com.miglayout:miglayout-swing:11.0'
}
......@@ -18,7 +18,7 @@ dependencies {
implementation 'commons-lang:commons-lang:2.6'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
implementation 'com.miglayout:miglayout-swing:11.0'
}
......@@ -20,8 +20,8 @@ dependencies {
implementation project(':moduli-autoreferee')
api project(':moduli-referee')
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-core:2.14.1'
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
implementation 'org.apache.logging.log4j:log4j-core:2.17.1'
implementation 'commons-io:commons-io:2.11.0'
implementation 'commons-lang:commons-lang:2.6'
......
......@@ -18,7 +18,7 @@ dependencies {
implementation project(':moduli-geometry')
implementation 'com.github.TIGERs-Mannheim:moduli:4.1'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
implementation 'commons-lang:commons-lang:2.6'
......
......@@ -10,8 +10,8 @@ plugins {
dependencies {
api 'com.github.TIGERs-Mannheim:moduli:4.1'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-core:2.14.1'
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
implementation 'org.apache.logging.log4j:log4j-core:2.17.1'
implementation 'commons-configuration:commons-configuration:1.10'
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment