diff --git a/artemis-java-template/build.gradle b/artemis-java-template/build.gradle index 1e4d0f2..7903a1a 100644 --- a/artemis-java-template/build.gradle +++ b/artemis-java-template/build.gradle @@ -4,6 +4,9 @@ plugins { id 'com.github.spotbugs' version '5.0.13' id 'maven-publish' id 'com.teamscale' version '26.0.1' + id 'org.openjfx.javafxplugin' version '0.0.13' + id 'org.springframework.boot' version '3.0.0' + id 'io.spring.dependency-management' version '1.1.0' } apply plugin: 'java' @@ -11,10 +14,11 @@ apply plugin: 'java' repositories { mavenCentral() mavenLocal() + maven { url 'https://repo.spring.io/milestone' } } dependencies { - testImplementation 'de.tum.in.ase:artemis-java-test-sandbox:1.10.1' + testImplementation 'de.tum.in.ase:artemis-java-test-sandbox:1.11.0' implementation 'org.apache.commons:commons-lang3:3.12.0' } diff --git a/artemis-java-template/gradle/wrapper/gradle-wrapper.jar b/artemis-java-template/gradle/wrapper/gradle-wrapper.jar index 249e583..943f0cb 100644 Binary files a/artemis-java-template/gradle/wrapper/gradle-wrapper.jar and b/artemis-java-template/gradle/wrapper/gradle-wrapper.jar differ diff --git a/artemis-java-template/gradle/wrapper/gradle-wrapper.properties b/artemis-java-template/gradle/wrapper/gradle-wrapper.properties index ae04661..f398c33 100644 --- a/artemis-java-template/gradle/wrapper/gradle-wrapper.properties +++ b/artemis-java-template/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/artemis-java-template/gradlew b/artemis-java-template/gradlew index a69d9cb..65dcd68 100755 --- a/artemis-java-template/gradlew +++ b/artemis-java-template/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/artemis-java-template/gradlew.bat b/artemis-java-template/gradlew.bat index f127cfd..93e3f59 100644 --- a/artemis-java-template/gradlew.bat +++ b/artemis-java-template/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/artemis-java-template/pom.xml b/artemis-java-template/pom.xml index 738644c..1ff99cb 100644 --- a/artemis-java-template/pom.xml +++ b/artemis-java-template/pom.xml @@ -8,12 +8,11 @@ Artemis Java Template UTF-8 + -Dfile.encoding=UTF-8 17.0.2 - 2.0.9 - 1.7.4 - 4.8.1 - 2.7.5 - 1.12.18 + 4.9.0 + 3.0.0 + 1.12.19 ${project.basedir}/staticCodeAnalysisConfig false @@ -95,6 +94,11 @@ log4j-core 2.19.0 + + org.springframework.boot + spring-boot-starter + ${springboot.version} + org.springframework.boot spring-boot-starter-web @@ -113,7 +117,7 @@ com.konghq unirest-java - 3.13.12 + 3.13.13 org.easymock @@ -145,26 +149,6 @@ jgoodies-forms 1.9.0 - - org.powermock - powermock-module-junit4 - ${powermock2.version} - - - org.powermock - powermock-api-mockito2 - ${powermock2.version} - - - org.powermock - powermock-module-junit4 - ${powermock1.version} - - - org.powermock - powermock-api-mockito - ${powermock1.version} - net.jqwik jqwik @@ -217,12 +201,12 @@ org.codehaus.plexus plexus-classworlds - 2.6.0 + 2.7.0 org.apache.maven.plugins maven-resources-plugin - 2.6 + 3.3.0 diff --git a/artemis-java-template/settings.gradle b/artemis-java-template/settings.gradle index 37bbc62..5377cd1 100644 --- a/artemis-java-template/settings.gradle +++ b/artemis-java-template/settings.gradle @@ -1,7 +1,7 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * This project uses @Incubating APIs which are subject to change. - */ - +pluginManagement { + repositories { + maven { url 'https://repo.spring.io/milestone' } + gradlePluginPortal() + } +} rootProject.name = 'Artemis Java Template'