Skip to content

Commit

Permalink
Update to Gradle 8.12 & update dependencies (#154)
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonKaran13 authored Jan 17, 2025
1 parent 4c89c2f commit 138e06b
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 28 deletions.
14 changes: 7 additions & 7 deletions artemis-java-template/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
plugins {
id 'checkstyle'
id 'pmd'
id 'com.github.spotbugs' version '6.0.9'
id 'com.github.spotbugs' version '6.1.0'
id 'maven-publish'
id 'com.teamscale' version '33.1.2'
id 'com.teamscale' version '34.2.1'
id 'org.openjfx.javafxplugin' version '0.1.0'
id 'org.springframework.boot' version '3.2.4'
id 'io.spring.dependency-management' version '1.1.4'
id 'org.checkerframework' version '0.6.37'
id 'org.springframework.boot' version '3.4.1'
id 'io.spring.dependency-management' version '1.1.7'
id 'org.checkerframework' version '0.6.48'
}

apply plugin: 'java'
Expand All @@ -20,9 +20,9 @@ repositories {

dependencies {
testImplementation 'de.tum.in.ase:artemis-java-test-sandbox:1.13.0'
testImplementation 'net.bytebuddy:byte-buddy:1.14.13'
testImplementation 'net.bytebuddy:byte-buddy:1.15.11'

implementation 'org.apache.commons:commons-lang3:3.14.0'
implementation 'org.apache.commons:commons-lang3:3.17.0'
}

def assignmentSrcDir = "assignment/src"
Expand Down
Binary file modified artemis-java-template/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 4 additions & 2 deletions artemis-java-template/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -84,7 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions artemis-java-template/gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
36 changes: 18 additions & 18 deletions artemis-java-template/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<argLine>-Dfile.encoding=UTF-8</argLine>
<javafx.version>17.0.8</javafx.version>
<mockito.version>5.12.0</mockito.version>
<springboot.version>3.3.0</springboot.version>
<bytebuddy.version>1.14.17</bytebuddy.version>
<mockito.version>5.15.2</mockito.version>
<springboot.version>3.4.1</springboot.version>
<bytebuddy.version>1.15.11</bytebuddy.version>
<scaConfigDirectory>${project.basedir}/staticCodeAnalysisConfig</scaConfigDirectory>
<analyzeTests>false</analyzeTests>
</properties>
Expand All @@ -25,18 +25,18 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
<version>3.17.0</version>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.10.2</version>
<version>5.11.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-testkit</artifactId>
<version>1.10.2</version>
<version>1.11.4</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -47,7 +47,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20240303</version>
<version>20250107</version>
</dependency>
<dependency>
<groupId>me.xdrop</groupId>
Expand Down Expand Up @@ -77,22 +77,22 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.17.1</version>
<version>2.18.2</version>
</dependency>
<dependency>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-core</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<version>6.9.0.202403050737-r</version>
<version>7.1.0.202411261347-r</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.23.1</version>
<version>2.24.3</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -116,13 +116,13 @@
</dependency>
<dependency>
<groupId>com.konghq</groupId>
<artifactId>unirest-java</artifactId>
<version>3.14.5</version>
<artifactId>unirest-java-core</artifactId>
<version>4.4.5</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>5.2.0</version>
<version>5.5.0</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Expand Down Expand Up @@ -157,7 +157,7 @@
<dependency>
<groupId>net.jqwik</groupId>
<artifactId>jqwik</artifactId>
<version>1.8.4</version>
<version>1.9.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -187,14 +187,14 @@
<type>pom</type>
</dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
<version>0.0.7</version>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>4.0.1</version>
<version>4.0.2</version>
</dependency>
<dependency>
<groupId>org.sonatype.spice</groupId>
Expand Down

0 comments on commit 138e06b

Please sign in to comment.